Merge branch 'master' of https://github.com/redmatrix/hubzilla into activitystreams

64 files changed, 1805 insertions, 1543 deletions

diff --git a/.homeinstall/hubzilla-setup.sh b/.homeinstall/hubzilla-setup.sh
index 5e8cd69c8..ec401e713 100755
--- a/.homeinstall/hubzilla-setup.sh
+++ b/.homeinstall/hubzilla-setup.sh
@@ -118,6 +118,51 @@ function check_sanity {
     fi
 }
 
+function check_config {
+    print_info "config check..."
+    # backup is important and should be checked
+	if [ -n "$backup_device_name" ]
+	then
+        device_mounted=0
+		if fdisk -l | grep -i "$backup_device_name.*linux"
+		then
+		    print_info "ok - filesystem of external device is linux"
+	        if [ -n "$backup_device_pass" ]
+	        then
+	            echo "$backup_device_pass" | cryptsetup luksOpen $backup_device_name cryptobackup
+	            if [ ! -d /media/hubzilla_backup ]
+	            then
+	                mkdir /media/hubzilla_backup
+	            fi
+	            if mount /dev/mapper/cryptobackup /media/hubzilla_backup
+	            then
+                    device_mounted=1
+	                print_info "ok - could encrypt and mount external backup device"
+                	umount /media/hubzilla_backup
+	            else
+            		print_warn "backup to external device will fail because encryption failed"
+	            fi
+                cryptsetup luksClose cryptobackup
+            else
+	            if mount $backup_device_name /media/hubzilla_backup
+	            then
+                    device_mounted=1
+	                print_info "ok - could mount external backup device"
+                	umount /media/hubzilla_backup
+	            else
+            		print_warn "backup to external device will fail because mount failed"
+	            fi
+            fi
+		else
+        	print_warn "backup to external device will fail because filesystem is either not linux or 'backup_device_name' is not correct in $configfile"
+		fi
+        if [ $device_mounted == 0 ]
+        then
+            die "backup device not ready"
+        fi
+	fi
+}
+
 function die {
     echo "ERROR: $1" > /dev/null 1>&2
     exit 1
@@ -619,85 +664,94 @@ function configure_cron_daily {
     # - update hubzilla core and addon
     # - update and upgrade linux
     # - reboot
-    cat > /var/www/$hubzilladaily <<END
-#!/bin/sh
-#
-echo " "
-echo "+++ \$(date) +++"
-echo " "
-# renew certificat if over 30 days old
-echo "\$(date) - renew certificat if 30 days old..."
-bash /var/www/letsencrypt/letsencrypt.sh --cron
-#
-# stop hubzilla
-echo "\$(date) - stoping apaache and mysql..."
-service apache2 stop
-/etc/init.d/mysql stop # to avoid inconsistancies
-#
-# backup
-echo "\$(date) - try to mount external device for backup..."
-backup_device_name=$backup_device_name
-backup_device_pass=$backup_device_pass
-backup_mount_point=$backup_mount_point
-device_mounted=0
-if [ -n "$backup_device_name" ] && [ -n "$backup_device_pass" ]
-then
-    if blkid | grep $backup_device_name
-    then
-        echo "decrypting backup device..."
-        echo "$backup_device_pass" | cryptsetup luksOpen $backup_device_name cryptobackup
-        if [ ! -d $backup_mount_point ]
-        then
-            mkdir $backup_mount_point
-        fi
-        echo "mounting backup device..."
-        if mount /dev/mapper/cryptobackup $backup_mount_point
-        then
-            device_mounted=1
-            echo "device $backup_device_name is now mounted. Starting backup..."
-			rsnapshot -c $snapshotconfig_external_device daily
-			rsnapshot -c $snapshotconfig_external_device weekly
-			rsnapshot -c $snapshotconfig_external_device monthly
-			echo "\$(date) - disk sizes..."
-			df -h
-			echo "\$(date) - db size..."
-			du -h $backup_mount_point | grep mysql/hubzilla
-            echo "unmounting backup device..."
-            umount $backup_mount_point
-        else
-            echo "failed to mount device $backup_device_name"
-        fi
-        echo "closing decrypted backup device..."
-        cryptsetup luksClose cryptobackup
+echo "#!/bin/sh" > /var/www/$hubzilladaily
+echo "#" >> /var/www/$hubzilladaily
+echo "echo \" \"" >> /var/www/$hubzilladaily
+echo "echo \"+++ \$(date) +++\"" >> /var/www/$hubzilladaily
+echo "echo \" \"" >> /var/www/$hubzilladaily
+echo "echo \"\$(date) - renew certificat if 30 days old...\"" >> /var/www/$hubzilladaily
+echo "bash /var/www/letsencrypt/letsencrypt.sh --cron" >> /var/www/$hubzilladaily
+echo "#" >> /var/www/$hubzilladaily
+echo "# stop hubzilla" >> /var/www/$hubzilladaily
+echo "echo \"\$(date) - stoping apaache and mysql...\"" >> /var/www/$hubzilladaily
+echo "service apache2 stop" >> /var/www/$hubzilladaily
+echo "/etc/init.d/mysql stop # to avoid inconsistancies" >> /var/www/$hubzilladaily
+echo "#" >> /var/www/$hubzilladaily
+echo "# backup" >> /var/www/$hubzilladaily
+echo "echo \"\$(date) - try to mount external device for backup...\"" >> /var/www/$hubzilladaily
+echo "backup_device_name=$backup_device_name" >> /var/www/$hubzilladaily
+echo "backup_device_pass=$backup_device_pass" >> /var/www/$hubzilladaily
+echo "backup_mount_point=$backup_mount_point" >> /var/www/$hubzilladaily
+echo "device_mounted=0" >> /var/www/$hubzilladaily
+echo "if [ -n \"$backup_device_name\" ]" >> /var/www/$hubzilladaily
+echo "then" >> /var/www/$hubzilladaily
+echo "    if blkid | grep $backup_device_name" >> /var/www/$hubzilladaily
+echo "    then" >> /var/www/$hubzilladaily
+	if [ -n "$backup_device_pass" ]
+	then
+echo "        echo \"decrypting backup device...\"" >> /var/www/$hubzilladaily
+echo "        echo "\"$backup_device_pass\"" | cryptsetup luksOpen $backup_device_name cryptobackup" >> /var/www/$hubzilladaily
     fi
-fi
-if [ \$device_mounted == 0 ]
-then
-    echo "device could not be mounted $backup_device_name. Using internal disk for backup..."
-	rsnapshot -c $snapshotconfig daily
-	rsnapshot -c $snapshotconfig weekly
-	rsnapshot -c $snapshotconfig monthly
-fi
-#
-echo "\$(date) - db size..."
-du -h /var/cache/rsnapshot/ | grep mysql/hubzilla
-#
-# update
-echo "\$(date) - updating letsencrypt.sh..."
-git -C /var/www/letsencrypt/ pull
-echo "\$(date) - updating hubhilla core..."
-git -C /var/www/html/ pull
-echo "\$(date) - updating hubhilla addons..."
-git -C /var/www/html/addon/ pull
-chown -R www-data:www-data /var/www/html/ # make all accessable for the webserver
-chown root:www-data /var/www/html/.htaccess
-chmod 0644 /var/www/html/.htaccess # www-data can read but not write it
-echo "\$(date) - updating linux..."
-apt-get -q -y update && apt-get -q -y dist-upgrade # update linux and upgrade
-echo "\$(date) - Backup hubzilla and update linux finished. Rebooting..."
-#
-reboot
-END
+echo "        if [ ! -d $backup_mount_point ]" >> /var/www/$hubzilladaily
+echo "        then" >> /var/www/$hubzilladaily
+echo "            mkdir $backup_mount_point" >> /var/www/$hubzilladaily
+echo "        fi" >> /var/www/$hubzilladaily
+echo "        echo \"mounting backup device...\"" >> /var/www/$hubzilladaily
+	if [ -n "$backup_device_pass" ]
+	then
+echo "        if mount /dev/mapper/cryptobackup $backup_mount_point" >> /var/www/$hubzilladaily
+	else
+echo "        if mount $backup_device_name $backup_mount_point" >> /var/www/$hubzilladaily
+	fi
+echo "        then" >> /var/www/$hubzilladaily
+echo "            device_mounted=1" >> /var/www/$hubzilladaily
+echo "            echo \"device $backup_device_name is now mounted. Starting backup...\"" >> /var/www/$hubzilladaily
+echo "			rsnapshot -c $snapshotconfig_external_device daily" >> /var/www/$hubzilladaily
+echo "			rsnapshot -c $snapshotconfig_external_device weekly" >> /var/www/$hubzilladaily
+echo "			rsnapshot -c $snapshotconfig_external_device monthly" >> /var/www/$hubzilladaily
+echo "			echo \"\$(date) - disk sizes...\"" >> /var/www/$hubzilladaily
+echo "			df -h" >> /var/www/$hubzilladaily
+echo "			echo \"\$(date) - db size...\"" >> /var/www/$hubzilladaily
+echo "			du -h $backup_mount_point | grep mysql/hubzilla" >> /var/www/$hubzilladaily
+echo "            echo \"unmounting backup device...\"" >> /var/www/$hubzilladaily
+echo "            umount $backup_mount_point" >> /var/www/$hubzilladaily
+echo "        else" >> /var/www/$hubzilladaily
+echo "            echo \"failed to mount device $backup_device_name\"" >> /var/www/$hubzilladaily
+echo "        fi" >> /var/www/$hubzilladaily
+	if [ -n "$backup_device_pass" ]
+	then
+echo "        echo \"closing decrypted backup device...\"" >> /var/www/$hubzilladaily
+echo "        cryptsetup luksClose cryptobackup" >> /var/www/$hubzilladaily
+	fi
+echo "    fi" >> /var/www/$hubzilladaily
+echo "fi" >> /var/www/$hubzilladaily
+echo "if [ \$device_mounted == 0 ]" >> /var/www/$hubzilladaily
+echo "then" >> /var/www/$hubzilladaily
+echo "    echo \"device could not be mounted $backup_device_name. Using internal disk for backup...\"" >> /var/www/$hubzilladaily
+echo "	rsnapshot -c $snapshotconfig daily" >> /var/www/$hubzilladaily
+echo "	rsnapshot -c $snapshotconfig weekly" >> /var/www/$hubzilladaily
+echo "	rsnapshot -c $snapshotconfig monthly" >> /var/www/$hubzilladaily
+echo "fi" >> /var/www/$hubzilladaily
+echo "#" >> /var/www/$hubzilladaily
+echo "echo \"\$(date) - db size...\"" >> /var/www/$hubzilladaily
+echo "du -h /var/cache/rsnapshot/ | grep mysql/hubzilla" >> /var/www/$hubzilladaily
+echo "#" >> /var/www/$hubzilladaily
+echo "# update" >> /var/www/$hubzilladaily
+echo "echo \"\$(date) - updating letsencrypt.sh...\"" >> /var/www/$hubzilladaily
+echo "git -C /var/www/letsencrypt/ pull" >> /var/www/$hubzilladaily
+echo "echo \"\$(date) - updating hubhilla core...\"" >> /var/www/$hubzilladaily
+echo "git -C /var/www/html/ pull" >> /var/www/$hubzilladaily
+echo "echo \"\$(date) - updating hubhilla addons...\"" >> /var/www/$hubzilladaily
+echo "git -C /var/www/html/addon/ pull" >> /var/www/$hubzilladaily
+echo "chown -R www-data:www-data /var/www/html/ # make all accessable for the webserver" >> /var/www/$hubzilladaily
+echo "chown root:www-data /var/www/html/.htaccess" >> /var/www/$hubzilladaily
+echo "chmod 0644 /var/www/html/.htaccess # www-data can read but not write it" >> /var/www/$hubzilladaily
+echo "echo \"\$(date) - updating linux...\"" >> /var/www/$hubzilladaily
+echo "apt-get -q -y update && apt-get -q -y dist-upgrade # update linux and upgrade" >> /var/www/$hubzilladaily
+echo "echo \"\$(date) - Backup hubzilla and update linux finished. Rebooting...\"" >> /var/www/$hubzilladaily
+echo "#" >> /var/www/$hubzilladaily
+echo "reboot" >> /var/www/$hubzilladaily
+
     if [ -z "`grep 'hubzilla-daily.sh' /etc/crontab`" ]
     then
         echo "30 05 * * * root /bin/bash /var/www/$hubzilladaily >> /var/www/html/hubzilla-daily.log 2>&1" >> /etc/crontab
@@ -761,6 +815,7 @@ sslconf=/etc/apache2/sites-available/default-ssl.conf
 
 #set -x    # activate debugging from here
 
+check_config
 update_upgrade
 install_apache
 install_php
diff --git a/.openshift/action_hooks/deploy b/.openshift/action_hooks/deploy
index 1dca4a5e8..06a2440a0 100755
--- a/.openshift/action_hooks/deploy
+++ b/.openshift/action_hooks/deploy
@@ -179,8 +179,10 @@ echo "chmod done, permissions set to 777 on poller script."
 
 # Hubzilla configuration - changes to default settings
 # to make Hubzilla on OpenShift a more pleasant experience 
-echo "Changing default configuration to conserve space"
+echo "Changing default configuration to conserve space and autocreate a social private channel upon account registration"
 cd ${OPENSHIFT_REPO_DIR}
+util/config system default_permissions_role social_private
+util/config system workflow_channel_next channel
 util/config system expire_delivery_reports 3
 util/config system feed_contacts 0
 util/config system diaspora_enabled 0
@@ -197,7 +199,7 @@ util/add_addon_repo https://github.com/redmatrix/hubzilla-addons.git HubzillaAdd
 # Hubzilla themes
 echo "Try to add or update Hubzilla themes"
 cd ${OPENSHIFT_REPO_DIR}
-util/add_theme_repo https://github.com/DeadSuperHero/redmatrix-themes.git DeadSuperHeroThemes 
+util/add_theme_repo https://github.com/DeadSuperHero/hubzilla-themes.git DeadSuperHeroThemes 
 
 # Hubzilla ownMapp
 echo "Try to add or update Hubzilla ownMapp"
@@ -205,6 +207,11 @@ cd ${OPENSHIFT_REPO_DIR}
 util/add_addon_repo https://gitlab.com/zot/ownmapp.git ownMapp
 
 # Hubzilla Chess
-echo "Try to add or update Hubzilla chess to Hubzilla on OpenShift"
+echo "Try to add or update Hubzilla chess "
 cd ${OPENSHIFT_REPO_DIR}
 util/add_addon_repo https://gitlab.com/zot/hubzilla-chess.git Chess
+
+# Hubzilla Hubsites
+echo "Try to add or update Hubzilla Hubsites"
+cd ${OPENSHIFT_REPO_DIR}
+util/add_addon_repo https://gitlab.com/zot/hubsites.git Hubsites
diff --git a/boot.php b/boot.php
index 57d239bec..bb4bc977d 100755
--- a/boot.php
+++ b/boot.php
@@ -48,7 +48,7 @@ require_once('include/AccessList.php');
 
 define ( 'PLATFORM_NAME',           'hubzilla' );
 define ( 'RED_VERSION',             trim(file_get_contents('version.inc')));
-define ( 'STD_VERSION',             '1.1.2' );
+define ( 'STD_VERSION',             '1.1.3' );
 define ( 'ZOT_REVISION',            1     );
 
 define ( 'DB_UPDATE_VERSION',       1161  );
@@ -1004,7 +1004,7 @@ class App {
 			'$user_scalable' => $user_scalable,
 			'$baseurl' => $this->get_baseurl(),
 			'$local_channel' => local_channel(),
-			'$generator' => PLATFORM_NAME . ' ' . RED_VERSION,
+			'$generator' => get_platform_name() . ((get_project_version()) ? ' ' . get_project_version() : ''),
 			'$update_interval' => $interval,
 			'$icon' => head_get_icon(),
 			'$head_css' => head_get_css(),
@@ -2344,3 +2344,41 @@ function check_cron_broken() {
 	set_config('system','lastpollcheck',datetime_convert());
 	return;
 }
+
+
+function get_platform_name() {
+	$a = get_app();
+	if(is_array($a->config) && is_array($a->config['system']) && $a->config['system']['platform_name'])
+		return $a->config['system']['platform_name'];
+	return PLATFORM_NAME;
+}
+
+function get_project_version() {
+	$a = get_app();
+	if(is_array($a->config) && is_array($a->config['system']) && $a->config['system']['hide_version'])
+		return '';
+	return RED_VERSION;
+}
+
+function get_update_version() {
+	$a = get_app();
+	if(is_array($a->config) && is_array($a->config['system']) && $a->config['system']['hide_version'])
+		return '';
+	return DB_UPDATE_VERSION;
+}
+
+
+function get_notify_icon() {
+	$a = get_app();
+	if(is_array($a->config) && is_array($a->config['system']) && $a->config['system']['email_notify_icon_url'])
+		return $a->config['system']['email_notify_icon_url'];
+	return z_root() . '/images/hz-white-32.png';
+}
+
+function get_site_icon() {
+	$a = get_app();
+	if(is_array($a->config) && is_array($a->config['system']) && $a->config['system']['site_icon_url'])
+		return $a->config['system']['site_icon_url'];
+	return z_root() . '/images/hz-32.png';
+}
+
diff --git a/doc/addons.bb b/doc/addons.bb
index a6d2cfc2f..6152089f9 100644
--- a/doc/addons.bb
+++ b/doc/addons.bb
@@ -1,19 +1,23 @@
 [h3]Plugins/Addons[/h3]
 [list=1]
 [*] abcjsplugin - Create musical scores in your posts
+[*] adultphotoflag - prevents nsfw photos from being displayed in public albums
 [*] bbmath - use complex math expressions in your posts
 [*] bookmarker - replace #^ with bookmark link in posts
 [*] buglink - provide a bug reporting icon in the lower-left corner of every page
 [*] calc - a scientific calculator
+[*] chess - cross domain identity aware interactive chess games
 [*] chords - generate fingering charts and alternatives for every known guitar chord
 [*] custom_home - set a custom page as the hub start page
-[*] diaspora - crosspost to a Diaspora account (different from the built-in Diaspora emulator)
+[*] dfedfix - fixes some federation issues with Diaspora releases around aug-sep 2015
+[*] diaspora - Diaspora protocol emulator
+[*] diaspost - crosspost to a Diaspora account (different from the Diaspora protocol emulator)
 [*] dirstats - show some interesting statistics generated by the driectory server
 [*] donate - provides a project donation page
 [*] dwpost - crosspost to Dreamwidth
 [*] embedly - use the embedly (formerly ooehmbed) service to embed media from many providers
 [*] extcron - use an external cron service to run your hub's scheduled tasks
-[*] flattr - provides a "Flattr Us" button
+[*] flattrwidget - provides a "Flattr Us" button
 [*] flip - create upside down text
 [*] fortunate - displays random quote (fortune cookie). Requires setting up a fortune server.
 [*] frphotos - import photo albums from Friendica
@@ -26,12 +30,15 @@
 [*] libertree - crosspost to Libertree
 [*] likebanner - create a "like us on red#matrix" banner image
 [*] ljpost - crosspost to LiveJournal
+[*] logrot - logfile rotation utility
 [*] mahjongg - Chinese puzzle game
 [*] mailhost - when using multiple channel clones, select one to receive email notifications
 [*] mayan_places - set location field to a random city in the Mayan world
 [*] morechoice - additional gender/sexual-preference choices for profiles (not safe for work)
 [*] moremoods - Additional mood options
 [*] morepokes - additional poke options (not safe for work)
+[*] msgfooter - provide legal or other text on each outgoing post
+[*] nofed - prevent "federation" of channel posts, maintains all interaction on your site
 [*] nsabait - add random terrorism related hashtags to your posts
 [*] nsfw - Highly recommended plugin to collpase posts with inappropriate content
 [*] openclipatar - choose a profile photo from hundreds of royalty free images
@@ -42,21 +49,29 @@
 [*] qrator - generate QR code images
 [*] rainbowtag - display your tag and category clouds in colours
 [*] randpost - post/reply bot based on and requires fortunate
+[*] redfiles - import file storage from redmatrix
+[*] redphotos - import photo albums from redmatrix
 [*] redred - Crosspost to another Red Matrix or Hubzilla channel
 [*] rtof - Crosspost to Friendica
+[*] sendzid - add 'zid' auth parmaters to all outbound links, not just in-network links
+[*] skeleton - sample addon/plugin to demonstrate plugin development
 [*] smiley_pack - extend the built-in smilie (emoticon) support
 [*] smileybutton - provides a smiley selector on the post window
 [*] startpage - set a personal preferred page to redirect after logging in.
+[*] statistics_json - Diaspora statistics generator
 [*] statusnet - GNU-social and StatusNet crosspost [zrl=[baseurl]/help/addons_gnusocial]Posting To Gnu Social[/zrl]
 [*] superblock - Highly recommended - completely block an offensive channel from your stream
+[*] testdrive - Turns your hub into a test drive site with accounts that expire after a trail period.
 [*] tictac - 3D tic-tac-toe
 [*] torch - flashlight app
 [*] tour - feature tour for new members
 [*] twitter - crosspost to Twitter
 [*] upload_limits - discover what server setting (there are a few) may be causing large photo uploads to fail
 [*] visage - show visitors to your channel
+[*] wholikesme - provides a page to display what connections have 'liked' your posts the most
 [*] webRTC - use an external server (mayfirst.org) to negotiate webRTC hookups
 [*] wppost - crosspost to WordPress (or other wordpress XMLRPC service)
+[*] xmpp - XMPP chat based on converse.js
 [/list]
 
 [h3]Addon Repositories[/h3]
diff --git a/doc/hidden_configs.bb b/doc/hidden_configs.bb
index b3ad91aa9..c07d6ca01 100644
--- a/doc/hidden_configs.bb
+++ b/doc/hidden_configs.bb
@@ -3,7 +3,7 @@
 $Projectname contains many configuration options hidden from the main admin panel.
 
 These are generally options considered too niche, confusing, or advanced for 
-the average member.  These settings can be activated from the the top level Red 
+the average member.  These settings can be activated from the the top level web 
 directory with the syntax [code]util/config cat key value[/code] for a site
 configuration, or [code]util/pconfig channel_id cat key value[/code] for a 
 member configuration.
@@ -11,14 +11,14 @@ member configuration.
 This document assumes you're an administrator.
 
 [b]pconfig[/b]
-    [b]system > user_scalable[/b]
+    [b]system.user_scalable[/b]
         Determine if the app is scalable on touch screens.  Defaults to on, to 
         disable, set to zero - real zero, not just false.
-    [b]system > always_my_theme[/b]
+    [b]system.always_my_theme[/b]
         Always use your own theme when viewing channels on the same hub.  This
         will break in some quite imaginative ways when viewing channels with 
         theme dependent Comanche.
-    [b]system > paranoia[/b]
+    [b]system.paranoia[/b]
         Sets the security level of IP checking. If the IP address of a logged-in session changes
 		apply this level to determine if the account should be logged out as a security breach.
             Options are: 
@@ -26,157 +26,172 @@ This document assumes you're an administrator.
                     1 - check 3 octets
                     2 - check 2 octets
                     3 - check for any difference at all
-    [b]system > prevent_tag_hijacking[/b]
+    [b]system.prevent_tag_hijacking[/b]
         Prevent foreign networks hijacking hashtags in your posts and directing them at its own resources.
-    [b]system > blocked[/b]
+    [b]system.blocked[/b]
         An array of xchans blocked by this channel.  Technically, this is a
         hidden config and does belong here, however, addons (notably 
         superblock) have made this available in the UI.
-    [b]system > default_cipher[/b]
+    [b]system.default_cipher[/b]
         Set the default cipher used for E2EE items.
-    [b]system > network_page_default[/b]
+    [b]system.network_page_default[/b]
         Set default params when viewing the network page.  This should contain
         the same querystring as manual filtering.
-    [b]system > display_friend_count[/b]
+    [b]system.display_friend_count[/b]
         Set the number of connections to display in the connections profile 
         widget.
-    [b]system > taganyone[/b]
+    [b]system.taganyone[/b]
         Requires the config of the same name to be enabled.  Allow the @mention tagging
         of anyone, whether you are connected or not.  This doesn't scale.
-    [b]system > startpage[/b]
+    [b]system.startpage[/b]
         Another of those technically hidden configs made available by addons.
         Sets the default page to view when logging in.  This is exposed to the
         UI by the startpage addon.
-    [b]system > forcepublicuploads[/b]
+    [b]system.forcepublicuploads[/b]
         Force uploaded photos to be public when uploaded as wall items.  It
         makes far more sense to just set your permissions properly in the first
         place.  Do that instead.
-    [b]system > do_not_track[/b]
+    [b]system.do_not_track[/b]
         As the browser header.  This will break many identity based features.  
         You should really just set permissions that make sense.
 
 [b]Site config[/b]
-    [b]system > taganyone[/b]
+    [b]system.taganyone[/b]
         Allow the @mention tagging of anyone whether you are connected or not.
-    [b]system > directorytags[/b]
+    [b]system.directorytags[/b]
         Set the number of keyword tags displayed on the directory page.
-	[b]system > disable_dreport[/b]
+	[b]system.disable_dreport[/b]
 		If '1', don't store or link to delivery reports
-    [b]system > startpage[/b]
+    [b]system.startpage[/b]
         Set the default page to be taken to after a login for all channels at
         this website.  Can be overwritten by user settings.
-    [b]system > projecthome[/b]
-        Set the project homepage as the homepage of your hub.
-	[b]system > default_permissions_role[/b]
+    [b]system.projecthome[/b]
+        Set the project homepage as the homepage of your hub. (Obsolete)
+	[b]system.auto_channel_create[/b]
+		Add the necessary form elements to create the first channel on the account registration page, and create it
+		(possibly following email validation or administrator approval). This precludes the ability to import a channel
+		from another site as the first channel created on this site for a new account. 
+		Use with system.default_permissions_role to streamline registration. 
+	[b]system.default_permissions_role[/b]
 		If set to a valid permissions role name, use that role for
 		the first channel created by a new account and don't ask for the "Channel Type" on
-		the channel creation form. Examples of valid names are: 'social', 'social_restricted', 'social_private', 'forum', 'forum_restricted' and 'forum_private'. Read more about permissions roles [zrl=[baseurl]/help/roles]here[/zrl].
-    [b]system > workflow_channel_next[/b]
+		the channel creation form. Examples of valid names are: 'social', 'social_restricted', 'social_private', 
+		'forum', 'forum_restricted' and 'forum_private'. 
+		Read more about permissions roles [zrl=[baseurl]/help/roles]here[/zrl].
+    [b]system.workflow_channel_next[/b]
         The page to direct users to immediately after creating a channel.
-    [b]system > max_daily_registrations[/b]
+    [b]system.max_daily_registrations[/b]
         Set the maximum number of new registrations allowed on any day.
         Useful to prevent oversubscription after a bout of publicity
         for the project.
-    [b]system > tos_url[/b]
+    [b]system.tos_url[/b]
         Set an alternative link for the ToS location.
-    [b]system > block_public_search[/b]
+    [b]system.block_public_search[/b]
         Similar to block_public, except only blocks public access to 
         search features.  Useful for sites that want to be public, but
         keep getting hammered by search engines.
-    [b]system > paranoia[/b]
+    [b]system.paranoia[/b]
         As the pconfig, but on a site-wide basis.  Can be overwritten
         by member settings.
-    [b]system > openssl_conf_file[/b]
+    [b]system.openssl_conf_file[/b]
         Specify a file containing OpenSSL configuration.  Read the code first.
         If you can't read the code, don't play with it.
-    [b]system > optimize_items[/b]
+    [b]system.optimize_items[/b]
         Runs optimise_table during some tasks to keep your database nice and 
         defragmented.  This comes at a performance cost while the operations
         are running, but also keeps things a bit faster while it's not.  
         There also exist CLI utilities for performing this operation, which you
         may prefer, especially if you're a large site.
-	[b]system > expire_limit
+	[b]system.expire_limit
 		Don't expire any more than this number of posts per channel per
 		expiration run to keep from exhausting memory. Default 5000.
-    [b]system > dlogfile[/b]
+    [b]system.dlogfile[/b]
         Logfile to use for logging development errors.  Exactly the same as
         logger otherwise.  This isn't magic, and requires your own logging
         statements.  Developer tool.
-    [b]system > authlog[/b]
+    [b]system.authlog[/b]
         Logfile to use for logging auth errors.  Used to plug in to server
         side software such as fail2ban.  Auth failures are still logged to
         the main logs as well.
-    [b]system > hide_in_statistics[/b]
+    [b]system.hide_in_statistics[/b]
         Tell the red statistics servers to completely hide this hub in hub lists.
-    [b]system > reserved_channels[/b]
+    [b]system.reserved_channels[/b]
         Don't allow members to register channels with this comma separated
         list of names (no spaces)
-    [b]system > auto_follow[/b]
+    [b]system.auto_follow[/b]
         Make the first channel of an account auto-follow channels listed here - comma separated list of webbies (member@hub addresses).
-    [b]system > admin_email[/b]
+    [b]system.admin_email[/b]
         Specifies the administrator's email for this site.  This is initially set during install.
-    [b]system > cron_hour[/b]
+    [b]system.cron_hour[/b]
         Specify an hour in which to run cron_daily.  By default with no config, this will run at midnight UTC.
-    [b]system > minimum_feedcheck_minutes[/b]
+    [b]system.minimum_feedcheck_minutes[/b]
         The minimum interval between polling RSS feeds.  If this is lower than the cron interval, feeds will be polled with each cronjob. Defaults to 60 if not set. The site setting can also be over-ridden on a channel by channel basis by a service class setting aptly named 'minimum_feedcheck_minutes'.
-    [b]system > blacklisted_sites[/b]
+    [b]system.blacklisted_sites[/b]
         An array of specific hubs to block from this hub completely.
-    [b]system > ignore_imagick[/b]
+    [b]system.ignore_imagick[/b]
         Ignore imagick and use GD, even if imagick is installed on the server. Prevents some issues with PNG files in older versions of imagick.
-    [b]system > no_age_restriction[/b]
+    [b]system.no_age_restriction[/b]
         Do not restrict registration to people over the age of 13. This carries legal responsibilities in many countries to require that age be provided and to block all personal information from minors, so please check your local laws before changing.  
-    [b]system > override_poll_lockfile[/b]
+    [b]system.override_poll_lockfile[/b]
         Ignore the lock file in the poller process to allow more than one process to run at a time.
-    [b]system > projecthome[/b]
+    [b]system.projecthome[/b]
         Display the project page on your home page for logged out viewers.
-    [b]system > sellpage[/b]
+    [b]system.sellpage[/b]
         A URL shown in the public sites list to sell your hub - display service classes, etc.
-    [b]randprofile > check[/b]
+    [b]randprofile.check[/b]
         When requesting a random profile, check that it actually exists first
-    [b]randprofile > retry[/b]
+    [b]randprofile.retry[/b]
         Number of times to retry getting a random profile
-    [b]system > photo_cache_time[/b]
+    [b]system.photo_cache_time[/b]
         How long to cache photos, in seconds. Default is 86400 (1 day).
         Longer time increases performance, but it also means it takes longer for changed permissions to apply.
-	[b]system > poco_rating_enable[/b]
+	[b]system.poco_rating_enable[/b]
 		Distributed reputation reporting and data collection may be disabled. If your site does not participate in distributed reputation you will also not be able to make use of the data from your connections on other sites. By default and in the absence of any setting it is enabled. Individual members can opt out by restricting who can see their connections or by not providing any reputation information for their connections.
-	[b]system > register_link[/b]
+	[b]system.register_link[/b]
 		path to direct to from the "register" link on the login form. On closed sites this will direct to 'pubsites'. For open sites it will normally redirect to 'register' but you may change this to a custom site page offering subscriptions or whatever. 
-	[b]system > max_import_size[/b]
+	[b]system.max_import_size[/b]
 		If configured, the maximum length of an imported text message. This is normally left at 200Kbytes or more to accomodate Friendica private photos, which are embedded.
-	[b]system > tempdir[/b]
-		Place to store temporary files, default is defined in the PHP configuration  
-	[b]system > uploaddir[/b]
-		Location to upload files (default is system.tempdir)
-	[b]system > disable_discover_tab[/b]
+	[b]system.tempdir[/b]
+		Place to store temporary files (currently unused), default is defined in the PHP configuration  
+	[b]system.uploaddir[/b]
+		Location to upload files (default is system.tempdir, currently used only by js_upload plugin)
+	[b]system.disable_discover_tab[/b]
 		This allows you to completely disable the ability to discover public content from external sites.
-	[b]system > sys_expire_days[/b]
+	[b]system.sys_expire_days[/b]
 		How many days to keep discovered public content from other sites
-	[b]system > openssl_encrypt[/b]
+	[b]system.openssl_encrypt[/b]
 		Use openssl encryption engine, default is false (uses mcrypt for AES encryption)
-	[b]system > max_tagged_forums[/b]
+	[b]system.max_tagged_forums[/b]
 		Spam prevention. Limits the number of tagged forums which are recognised in any post. Default is 2. Only the first 'n' tags will be delivered as forums, the others will not cause any delivery. 
-	[b]system > openssl_conf_file[/b]
+	[b]system.openssl_conf_file[/b]
 		Needed in some Windows installations to locate the openssl configuration file on the system.
- 	[b]system > hide_help[/b]
+ 	[b]system.hide_help[/b]
 		Don't display help documentation link in nav bar
- 	[b]system > expire_delivery_reports[/b]
+ 	[b]system.expire_delivery_reports[/b]
 		Expiration in days for delivery reports - default 10
+	[b]system.platform_name[/b] *
+		What to report as the platform name in webpages and statistics. (*) Must be set in .htconfig.php
+	[b]system.hide_version[/b] *
+		If true, do not report the software version on webpages and tools. (*) Must be set in .htconfig.php
+	[b]system.hidden_version_siteinfo[/b]
+		If true, do not report the software version on siteinfo pages (system.hide_version also hides the version on these pages, this setting *only* hides the version on siteinfo pages).
+	[b]system.email_notify_icon_url[/b]
+		URL of image (32x32) to display in email notifications (HTML bodies).
 
 [b]Directory config[/b]
 [b]Directory search defaults[/b]
-	[b]directory > safemode[/b]
+	[b]directory.safemode[/b]
 		0 or 1. 	
-    [b]directory > globaldir[/b]
+    [b]directory.globaldir[/b]
 	    0 or 1. Default 0.  If you visit the directory on a site you'll just see the members of that site by default. You have to go through an extra step to see the people in the rest of the network; and by doing so there's a clear delineation that these people *aren't* members of that site but of a larger network.
-    [b]directory > pubforums[/b]
+    [b]directory.pubforums[/b]
 	    0 or 1. Public forums *should* be default 0.
 [b]Directory server configuration (see [zrl=[baseurl]/help/directories]help/directories[/zrl])[/b]
-	[b]system > directory_server[/b]
-	[b]system > directory_primary[/b]
-	[b]system > directory_realm[/b]
-	[b]system > realm_token[/b]
-	[b]system > directory_mode[/b]
+	[b]system.directory_server[/b]
+	[b]system.directory_primary[/b]
+	[b]system.directory_realm[/b]
+	[b]system.realm_token[/b]
+	[b]system.directory_mode[/b]
 
 
 
diff --git a/doc/to_do_code.bb b/doc/to_do_code.bb
index 57f4b2e01..85c5997cb 100644
--- a/doc/to_do_code.bb
+++ b/doc/to_do_code.bb
@@ -8,7 +8,6 @@ We need much more than this, but here are areas where developers can help. Pleas
 [li]SAML 2.0 and OpenID Connect provider functionality[/li]

 [li]Create bug tracker module[/li]

 [li]Filing posts - provide a dropdown menu integrated with the 'post actions menu'[/li]

-[li]integrate Mozilla Persona (possibly via plugin) https://github.com/mozilla/id-specs/blob/prod/browserid/index.md and become an idP[/li]

 [li]translation plugins - moses or apertium[/li]

 [li]plugins - provide 'disable' which is softer than 'uninstall' for those plugins which create additional DB tables[/li]

 [li]Infinite scroll improvements (i.e. embedded page links) see http://scrollsample.appspot.com/items [/li]

@@ -20,7 +19,6 @@ We need much more than this, but here are areas where developers can help. Pleas
 [li]Support comments on webpages[/li]

 [li]implement oembed provider interface[/li]

 [li]refactor the oembed client interface so that we can safely sandbox remote content[/li]

-[li]Many modern social apps now have both a profile photo and a "cover photo". Add support for this. [/li]

 [li]Write more webpage layouts[/li]

 [li]Write more webpage widgets[/li]

 [li]restricted access OAuth clients[/li]

@@ -40,7 +38,6 @@ We need much more than this, but here are areas where developers can help. Pleas
 [li]App taxonomy[/li]

 [li]Customisable App collection pages[/li]

 [li]replace the tinymce visual editor and/or make the visual editor pluggable and responsive to different output formats. We probably want library/bbedit for bbcode. This needs a fair bit of work to catch up with our &quot;enhanced bbcode&quot;, but start with images, links, bold and highlight and work from there.[/li]

-[li]Photos module - turn photos into normal conversations and fix tagging[/li]

 [li]Create mobile clients for the top platforms - which involves extending the API so that we can do stuff far beyond the current crop of Twitter/Statusnet clients. Ditto for mobile themes. We can probably use something like the Friendica Android app as a base to start from.[/li]

 [li](in progress Habeas Codice) Implement owned and exchangeable &quot;things&quot;.[/li]

 [li]Family Account creation - using service classes (an account holder can create a certain number of sub-accounts which are all tied to their subscription - if the subscription lapses they all go away).[/li]

diff --git a/include/Contact.php b/include/Contact.php
index 3bd5f9936..611371db6 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -331,6 +331,7 @@ function channel_remove($channel_id, $local = true, $unset_session=true) {
 		dbesc(datetime_convert()),
 		intval($channel_id)
 	);
+
 	// if this was the default channel, set another one as default
 	if($a->account['account_default_channel'] == $channel_id) {
 		$r = q("select channel_id from channel where channel_account_id = %d and channel_removed = 0 limit 1",
@@ -344,12 +345,11 @@ function channel_remove($channel_id, $local = true, $unset_session=true) {
 		}
 		else {
 			$rr = q("update account set account_default_channel = 0 where account_id = %d",
-				intval($r[0]['channel_id']),
-				intval($a->account['account_id']));
+				intval($a->account['account_id'])
+			);
 		}
 	}
 
-
 	logger('deleting hublocs',LOGGER_DEBUG);
 
 	$r = q("update hubloc set hubloc_deleted = 1 where hubloc_hash = '%s' and hubloc_url = '%s' ",
diff --git a/include/api.php b/include/api.php
index 5053977c5..ef41a4912 100644
--- a/include/api.php
+++ b/include/api.php
@@ -2106,10 +2106,10 @@ require_once('include/api_auth.php');
 			'private' => $private, 'textlimit' => $textlimit, 'sslserver' => $sslserver, 'ssl' => $ssl,
 			'shorturllength' => '30',
         	'hubzilla' => array(
-				'PLATFORM_NAME' => PLATFORM_NAME,
-				'RED_VERSION' => RED_VERSION,
+				'PLATFORM_NAME' => get_platform_name(),
+				'RED_VERSION' => get_project_version(),
 				'ZOT_REVISION' => ZOT_REVISION,
-				'DB_UPDATE_VERSION' => DB_UPDATE_VERSION
+				'DB_UPDATE_VERSION' => get_update_version()
 			)
 		));  
 
@@ -2142,12 +2142,12 @@ require_once('include/api_auth.php');
 
 		if($type === 'xml') {
 			header("Content-type: application/xml");
-			echo '<?xml version="1.0" encoding="UTF-8"?>' . "\r\n" . '<version>' . RED_VERSION . '</version>' . "\r\n";
+			echo '<?xml version="1.0" encoding="UTF-8"?>' . "\r\n" . '<version>' . get_project_version() . '</version>' . "\r\n";
 			killme();
 		}
 		elseif($type === 'json') {
 			header("Content-type: application/json");
-			echo '"' . RED_VERSION . '"';
+			echo '"' . get_project_version() . '"';
 			killme();
 		}
 	}
diff --git a/include/conversation.php b/include/conversation.php
index 747bb5d0a..1ade8ed3a 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -942,25 +942,35 @@ function item_photo_menu($item){
 		$clean_url = normalise_link($item['author-link']);
 	}
 
-	$menu = Array(
+	$poco_rating = get_config('system','poco_rating_enable');
+	// if unset default to enabled
+	if($poco_rating === false)
+		$poco_rating = true;
+
+	$ratings_url = (($poco_rating) ? z_root() . '/ratings/' . urlencode($item['author_xchan']) : '');
+
+	$post_menu = Array(
 		t("View Source") => $vsrc_link,
 		t("Follow Thread") => $sub_link,
 		t("Unfollow Thread") => $unsub_link,
-		t("View Status") => $status_link,
+	);
+
+	$author_menu = array(
 		t("View Profile") => $profile_link,
-		t("View Photos") => $photos_link,
 		t("Activity/Posts") => $posts_link,
 		t("Connect") => $follow_url,
 		t("Edit Connection") => $contact_url,
-		t("Send PM") => $pm_url,
+		t("Message") => $pm_url,
+		t('Ratings') => $ratings_url,
 		t("Poke") => $poke_link
 	);
 
-	$args = array('item' => $item, 'menu' => $menu);
+
+	$args = array('item' => $item, 'post_menu' => $post_menu, 'author_menu' => $author_menu);
 
 	call_hooks('item_photo_menu', $args);
 
-	$menu = $args['menu'];
+	$menu = array_merge($args['post_menu'],$args['author_menu']);
 
 	$o = "";
 	foreach($menu as $k=>$v){
diff --git a/include/enotify.php b/include/enotify.php
index c9b6e0463..5bb53aa0e 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -529,6 +529,7 @@ function notification($params) {
 		$tpl = get_markup_template('email_notify_html.tpl');
 		$email_html_body = replace_macros($tpl,array(
 			'$banner'       => $datarray['banner'],
+			'$notify_icon'  => get_notify_icon(),
 			'$product'      => $datarray['product'],
 			'$preamble'     => $datarray['preamble'],
 			'$sitename'     => $datarray['sitename'],
diff --git a/include/event.php b/include/event.php
index 539bfe484..51988acac 100644
--- a/include/event.php
+++ b/include/event.php
@@ -67,7 +67,7 @@ function ical_wrapper($ev) {
 	$o .= "BEGIN:VCALENDAR";
 	$o .= "\r\nVERSION:2.0";
 	$o .= "\r\nMETHOD:PUBLISH";
-	$o .= "\r\nPRODID:-//" . get_config('system','sitename') . "//" . PLATFORM_NAME . "//" . strtoupper(get_app()->language). "\r\n";
+	$o .= "\r\nPRODID:-//" . get_config('system','sitename') . "//" . get_platform_name() . "//" . strtoupper(get_app()->language). "\r\n";
 	if(array_key_exists('start', $ev))
 		$o .= format_event_ical($ev);
 	else {
diff --git a/include/features.php b/include/features.php
index ffa8bf8ca..b18a58ed4 100644
--- a/include/features.php
+++ b/include/features.php
@@ -49,6 +49,7 @@ function get_features($filtered = true) {
 			array('advanced_profiles',   t('Advanced Profiles'),      t('Additional profile sections and selections'),false,get_config('feature_lock','advanced_profiles')),
 			array('profile_export',      t('Profile Import/Export'),  t('Save and load profile details across sites/channels'),false,get_config('feature_lock','profile_export')),
 			array('webpages',            t('Web Pages'),              t('Provide managed web pages on your channel'),false,get_config('feature_lock','webpages')),
+			array('hide_rating',       t('Hide Rating'),          t('Hide the rating buttons on your channel and profile pages. Note: People can still rate you somewhere else.'),false,get_config('feature_lock','hide_rating')),			
 			array('private_notes',       t('Private Notes'),          t('Enables a tool to store notes and reminders'),false,get_config('feature_lock','private_notes')),
 			array('nav_channel_select',  t('Navigation Channel Select'), t('Change channels directly from within the navigation dropdown menu'),false,get_config('feature_lock','nav_channel_select')),
 			array('photo_location',       t('Photo Location'),          t('If location data is available on uploaded photos, link this to a map.'),false,get_config('feature_lock','photo_location')),
diff --git a/include/identity.php b/include/identity.php
index deccaa299..32c4dd130 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -482,6 +482,8 @@ function identity_basic_export($channel_id, $items = false) {
 
 	$ret = array();
 
+	// use constants here as otherwise we will have no idea if we can import from a site 
+	// with a non-standard platform and version.
 	$ret['compatibility'] = array('project' => PLATFORM_NAME, 'version' => RED_VERSION, 'database' => DB_UPDATE_VERSION);
 
 	$r = q("select * from channel where channel_id = %d limit 1",
@@ -1049,8 +1051,10 @@ function profile_sidebar($profile, $block = 0, $show_connect = true) {
 	$tpl = get_markup_template('profile_vcard.tpl');
 
 	require_once('include/widgets.php');
-	$z = widget_rating(array('target' => $profile['channel_hash']));
 
+	if(! feature_enabled($profile['uid'],'hide_rating'))
+		$z = widget_rating(array('target' => $profile['channel_hash']));
+		
 	$o .= replace_macros($tpl, array(
 		'$profile'       => $profile,
 		'$connect'       => $connect,
@@ -1771,4 +1775,4 @@ function get_cover_photo($channel_id,$format = 'bbcode', $res = PHOTO_RES_COVER_
 
 	return $output;  
 		
-}
\ No newline at end of file
+}
diff --git a/include/items.php b/include/items.php
index 0e16f7b8a..6acf1c883 100755
--- a/include/items.php
+++ b/include/items.php
@@ -604,8 +604,8 @@ function get_feed_for($channel, $observer_hash, $params) {
 	$atom = '';
 
 	$atom .= replace_macros($feed_template, array(
-		'$version'      => xmlify(RED_VERSION),
-		'$red'          => xmlify(PLATFORM_NAME),
+		'$version'      => xmlify(get_project_version()),
+		'$red'          => xmlify(get_platform_name()),
 		'$feed_id'      => xmlify($channel['xchan_url']),
 		'$feed_title'   => xmlify($channel['channel_name']),
 		'$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', 'now' , ATOM_TIME)) ,
diff --git a/include/language.php b/include/language.php
index 59979aa85..cea31924c 100644
--- a/include/language.php
+++ b/include/language.php
@@ -182,7 +182,7 @@ function t($s, $ctx = '') {
 
 function translate_projectname($s) {
 
-	return str_replace(array('$projectname','$Projectname'),array(PLATFORM_NAME,ucfirst(PLATFORM_NAME)),$s);
+	return str_replace(array('$projectname','$Projectname'),array(get_platform_name(),ucfirst(get_platform_name())),$s);
 
 }
 
diff --git a/include/network.php b/include/network.php
index 94298abef..fe6b553e9 100644
--- a/include/network.php
+++ b/include/network.php
@@ -1619,18 +1619,19 @@ function format_and_send_email($sender,$xchan,$item) {
 		// load the template for private message notifications
 		$tpl = get_markup_template('email_notify_html.tpl');
 		$email_html_body = replace_macros($tpl,array(
-			'$banner'	   => $banner,
-			'$product'	  => $product,
-			'$preamble'	 => '',
-			'$sitename'	 => $sitename,
-			'$siteurl'	  => $siteurl,
+			'$banner'	    => $banner,
+			'$notify_icon'  => get_notify_icon(),
+			'$product'	    => $product,
+			'$preamble'	    => '',
+			'$sitename'	    => $sitename,
+			'$siteurl'	    => $siteurl,
 			'$source_name'  => $sender['xchan_name'],
 			'$source_link'  => $sender['xchan_url'],
 			'$source_photo' => $sender['xchan_photo_m'],
-			'$username'	 => $xchan['xchan_name'],
+			'$username'	    => $xchan['xchan_name'],
 			'$hsitelink'	=> $datarray['hsitelink'],
 			'$hitemlink'	=> $datarray['hitemlink'],
-			'$thanks'	   => $thanks,
+			'$thanks'	    => $thanks,
 			'$site_admin'   => $site_admin,
 			'$title'		=> $title,
 			'$htmlversion'  => $htmlversion,
@@ -1639,20 +1640,20 @@ function format_and_send_email($sender,$xchan,$item) {
 		// load the template for private message notifications
 		$tpl = get_markup_template('email_notify_text.tpl');
 		$email_text_body = replace_macros($tpl, array(
-			'$banner'	   => $banner,
-			'$product'	  => $product,
-			'$preamble'	 => '',
-			'$sitename'	 => $sitename,
-			'$siteurl'	  => $siteurl,
+			'$banner'       => $banner,
+			'$product'      => $product,
+			'$preamble'     => '',
+			'$sitename'     => $sitename,
+			'$siteurl'      => $siteurl,
 			'$source_name'  => $sender['xchan_name'],
 			'$source_link'  => $sender['xchan_url'],
 			'$source_photo' => $sender['xchan_photo_m'],
-			'$username'	 => $xchan['xchan_name'],
-			'$hsitelink'	=> $datarray['hsitelink'],
-			'$hitemlink'	=> $datarray['hitemlink'],
-			'$thanks'	   => $thanks,
+			'$username'     => $xchan['xchan_name'],
+			'$hsitelink'    => $datarray['hsitelink'],
+			'$hitemlink'    => $datarray['hitemlink'],
+			'$thanks'       => $thanks,
 			'$site_admin'   => $site_admin,
-			'$title'		=> $title,
+			'$title'        => $title,
 			'$textversion'  => $textversion
 		));
 
@@ -1666,13 +1667,13 @@ function format_and_send_email($sender,$xchan,$item) {
 		// use the EmailNotification library to send the message
 
 		enotify::send(array(
-			'fromName'			 => $product,
-			'fromEmail'			=> $sender_email,
-			'replyTo'			  => $sender_email,
-			'toEmail'			  => str_replace('mailto:','',$xchan['xchan_addr']),
-			'messageSubject'	   => (($title) ? $title : t('No Subject')),
-			'htmlVersion'		  => $email_html_body,
-			'textVersion'		  => $email_text_body,
+			'fromName'             => $product,
+			'fromEmail'            => $sender_email,
+			'replyTo'              => $sender_email,
+			'toEmail'              => str_replace('mailto:','',$xchan['xchan_addr']),
+			'messageSubject'       => (($title) ? $title : t('No Subject')),
+			'htmlVersion'          => $email_html_body,
+			'textVersion'          => $email_text_body,
 			'additionalMailHeader' => '',
 		));
 
@@ -1767,16 +1768,13 @@ function get_site_info() {
 	$site_info = get_config('system','info');
 	$site_name = get_config('system','sitename');
 	if(! get_config('system','hidden_version_siteinfo')) {
-		$version = RED_VERSION;
+		$version = get_project_version();
 		$tag = get_std_version();
 
 		if(@is_dir('.git') && function_exists('shell_exec')) {
 			$commit = trim( @shell_exec('git log -1 --format="%h"'));
-//			if(! get_config('system','hidden_tag_siteinfo'))
-//				$tag = trim( @shell_exec('git describe --tags --abbrev=0'));
-//			else 
-//				$tag = '';
 		}
+
 		if(! isset($commit) || strlen($commit) > 16)
 			$commit = '';
 	}
@@ -1820,7 +1818,7 @@ function get_site_info() {
 		'locked_features' => $locked_features,
 		'admin' => $admin,
 		'site_name' => (($site_name) ? $site_name : ''),
-		'platform' => PLATFORM_NAME,
+		'platform' => get_platform_name(),
 		'dbdriver' => $db->getdriver(),
 		'lastpoll' => get_config('system','lastpoll'),
 		'info' => (($site_info) ? $site_info : ''),
diff --git a/include/permissions.php b/include/permissions.php
index a8e761f87..8071af686 100644
--- a/include/permissions.php
+++ b/include/permissions.php
@@ -641,10 +641,10 @@ function get_role_perms($role) {
 			$ret['directory_publish'] = true;
 			$ret['online'] = false;
 			$ret['perms_follow'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_ABOOK
-				|PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT
+				|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT
 				|PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_A_REPUBLISH|PERMS_W_LIKE|PERMS_W_TAGWALL;
 			$ret['perms_accept'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_ABOOK
-				|PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT
+				|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT
 				|PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_A_REPUBLISH|PERMS_W_LIKE|PERMS_W_TAGWALL;
 			$ret['channel_r_stream']    = PERMS_PUBLIC;
 			$ret['channel_r_profile']   = PERMS_PUBLIC;
diff --git a/include/security.php b/include/security.php
index d4ebe0024..2a9a6e39e 100644
--- a/include/security.php
+++ b/include/security.php
@@ -18,20 +18,13 @@ function authenticate_success($user_record, $login_initial = false, $interactive
 
 	$_SESSION['addr'] = $_SERVER['REMOTE_ADDR'];
 
+	$lastlog_updated = false;
+
 	if(x($user_record, 'account_id')) {
 		$a->account = $user_record;
 		$_SESSION['account_id'] = $user_record['account_id'];
 		$_SESSION['authenticated'] = 1;
 
-		if($login_initial || $update_lastlog) {
-			q("update account set account_lastlog = '%s' where account_id = %d",
-				dbesc(datetime_convert()),
-				intval($_SESSION['account_id'])
-			);
-			$a->account['account_lastlog'] = datetime_convert();
-			call_hooks('logged_in', $a->account);
-
-		}
 
 		$uid_to_load = (((x($_SESSION,'uid')) && (intval($_SESSION['uid']))) 
 			? intval($_SESSION['uid']) 
@@ -42,9 +35,19 @@ function authenticate_success($user_record, $login_initial = false, $interactive
 			change_channel($uid_to_load);
 		}
 
+		if($login_initial || $update_lastlog) {
+			q("update account set account_lastlog = '%s' where account_id = %d",
+				dbesc(datetime_convert()),
+				intval($_SESSION['account_id'])
+			);
+			$a->account['account_lastlog'] = datetime_convert();
+			$lastlog_updated = true;
+			call_hooks('logged_in', $a->account);
+		}
+
 	}
 
-	if($login_initial) {
+	if(($login_initial) && (! $lastlog_updated)) {
 
 		call_hooks('logged_in', $user_record);
 
diff --git a/include/text.php b/include/text.php
index 6f7297bb0..a03648081 100644
--- a/include/text.php
+++ b/include/text.php
@@ -812,7 +812,7 @@ function contact_block() {
 		);
 
 		if(count($r)) {
-			$contacts = sprintf( tt('%d Connection','%d Connections', $total),$total);
+			$contacts = t('Connections');
 			$micropro = Array();
 			foreach($r as $rr) {
 				$rr['archived'] = (intval($rr['abook_archived']) ? true : false);
@@ -825,7 +825,7 @@ function contact_block() {
 	$o = replace_macros($tpl, array(
 		'$contacts' => $contacts,
 		'$nickname' => $a->profile['channel_address'],
-		'$viewconnections' => t('View Connections'),
+		'$viewconnections' => (($total > $shown) ? sprintf(t('View all %s connections'),$total) : ''),
 		'$micropro' => $micropro,
 	));
 
diff --git a/include/widgets.php b/include/widgets.php
index 60605cb51..8e8f67ae6 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -1110,16 +1110,18 @@ function widget_rating($arr) {
 
 	}
 
+
+	$o = '<div class="widget">';
+	$o .= '<h3>' . t('Rating Tools') . '</h3>';
+
 	if((($remote) || (local_channel())) && (! $self)) {
-		$o = '<div class="widget rateme">';
 		if($remote)
-			$o .= '<a class="rateme" href="' . $url . '"><i class="icon-pencil"></i> ' . t('Rate Me') . '</a>';
+			$o .= '<a class="btn btn-block btn-primary btn-sm" href="' . $url . '"><i class="icon-pencil"></i> ' . t('Rate Me') . '</a>';
 		else
-			$o .= '<div class="rateme fakelink" onclick="doRatings(\'' . $hash . '\'); return false;"><i class="icon-pencil"></i> ' . t('Rate Me') . '</div>';
-		$o .= '</div>';
+			$o .= '<div class="btn btn-block btn-primary btn-sm" onclick="doRatings(\'' . $hash . '\'); return false;"><i class="icon-pencil"></i> ' . t('Rate Me') . '</div>';
 	}
 
-	$o .= '<div class="widget rateme"><a class="rateme" href="ratings/' . $hash . '"><i class="icon-eye-open"></i> ' . t('View Ratings') . '</a>';
+	$o .= '<a class="btn btn-block btn-default btn-sm" href="ratings/' . $hash . '"><i class="icon-eye-open"></i> ' . t('View Ratings') . '</a>';
 	$o .= '</div>';
 
 	return $o;
diff --git a/include/zot.php b/include/zot.php
index beaa54126..9d09aaf58 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -3828,7 +3828,7 @@ function zotinfo($arr) {
 		$ret['site']['channels'] = channel_total();
 
 
-		$ret['site']['version'] = PLATFORM_NAME . ' ' . RED_VERSION . '[' . DB_UPDATE_VERSION . ']';
+		$ret['site']['version'] = get_platform_name() . ' ' . RED_VERSION . '[' . DB_UPDATE_VERSION . ']';
 
 		$ret['site']['admin'] = get_config('system','admin_email');
 
@@ -3848,7 +3848,7 @@ function zotinfo($arr) {
 		$ret['site']['sellpage'] = get_config('system','sellpage');
 		$ret['site']['location'] = get_config('system','site_location');
 		$ret['site']['realm'] = get_directory_realm();
-		$ret['site']['project'] = PLATFORM_NAME;
+		$ret['site']['project'] = get_platform_name();
 
 	}
 
diff --git a/index.php b/index.php
index c864a7b37..7e9cde9bb 100755
--- a/index.php
+++ b/index.php
@@ -11,6 +11,10 @@
  * bootstrap the application
  */
 require_once('boot.php');
+
+if(file_exists('.htsite.php'))
+	include('.htsite.php');
+
 // our global App object
 $a = new App;
 
diff --git a/install/htconfig.sample.php b/install/htconfig.sample.php
index 21697a951..794afa93b 100755
--- a/install/htconfig.sample.php
+++ b/install/htconfig.sample.php
@@ -17,7 +17,7 @@ $db_port = 0;                    // leave 0 for default or set your port
 $db_user = 'mysqlusername';
 $db_pass = 'mysqlpassword';
 $db_data = 'mysqldatabasename';
-
+$db_type = 0; // use 1 for postgres, 0 for mysql
 
 /*
  * Notice: Many of the following settings will be available in the admin panel 
diff --git a/library/HTMLPurifier/DefinitionCache/Serializer/README b/library/HTMLPurifier/DefinitionCache/Serializer/README
index 2e35c1c3d..2e35c1c3d 100755..100644
--- a/library/HTMLPurifier/DefinitionCache/Serializer/README
+++ b/library/HTMLPurifier/DefinitionCache/Serializer/README
diff --git a/library/font_awesome/src/assets/css/prettify.css b/library/font_awesome/src/assets/css/prettify.css
index aedd8d1a9..aedd8d1a9 100755..100644
--- a/library/font_awesome/src/assets/css/prettify.css
+++ b/library/font_awesome/src/assets/css/prettify.css
diff --git a/library/font_awesome/src/assets/js/ZeroClipboard-1.1.7.swf b/library/font_awesome/src/assets/js/ZeroClipboard-1.1.7.swf
index 880e64ee7..880e64ee7 100755..100644
--- a/library/font_awesome/src/assets/js/ZeroClipboard-1.1.7.swf
+++ b/library/font_awesome/src/assets/js/ZeroClipboard-1.1.7.swf
diff --git a/library/stylish_select/stylish-select.css b/library/stylish_select/stylish-select.css
index 1f3dcd28d..1f3dcd28d 100755..100644
--- a/library/stylish_select/stylish-select.css
+++ b/library/stylish_select/stylish-select.css
diff --git a/mod/admin.php b/mod/admin.php
index 2d859399b..b537992d7 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -492,7 +492,7 @@ function admin_page_site(&$a) {
 		'$delivery_batch_count' => array('delivery_batch_count', t('Deliveries per process'),(x(get_config('system','delivery_batch_count'))?get_config('system','delivery_batch_count'):1), t("Number of deliveries to attempt in a single operating system process. Adjust if necessary to tune system performance. Recommend: 1-5.")),
 		'$poll_interval'			=> array('poll_interval', t("Poll interval"), (x(get_config('system','poll_interval'))?get_config('system','poll_interval'):2), t("Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval.")),
 		'$maxloadavg'			=> array('maxloadavg', t("Maximum Load Average"), ((intval(get_config('system','maxloadavg')) > 0)?get_config('system','maxloadavg'):50), t("Maximum system load before delivery and poll processes are deferred - default 50.")),
-		'$default_expire_days' => array('default_expire_days', t('Expiration period in days for imported (matrix/network) content'), intval(get_config('system','default_expire_days')), t('0 for no expiration of imported content')),
+		'$default_expire_days' => array('default_expire_days', t('Expiration period in days for imported (grid/network) content'), intval(get_config('system','default_expire_days')), t('0 for no expiration of imported content')),
 		'$form_security_token' => get_form_security_token("admin_site"),
 	));
 }
diff --git a/mod/help.php b/mod/help.php
index c4549a2bd..e1c6fede8 100644
--- a/mod/help.php
+++ b/mod/help.php
@@ -157,7 +157,7 @@ function help_content(&$a) {
 				$path = trim(substr($dirname,4),'/');
 
 				$o .= '<li><a href="help/' . (($path) ? $path . '/' : '') . $fname . '" >' . ucwords(str_replace('_',' ',notags($fname))) . '</a><br />' . 
-				str_replace('$Projectname',PLATFORM_NAME,substr($rr['text'],0,200)) . '...<br /><br /></li>';
+				str_replace('$Projectname',get_platform_name(),substr($rr['text'],0,200)) . '...<br /><br /></li>';
 
 			}
 			$o .= '</ul>';
@@ -229,6 +229,8 @@ function help_content(&$a) {
 	if($doctype === 'bbcode') {
 		require_once('include/bbcode.php');
 		$content = bbcode($text);
+		// bbcode retargets external content to new windows. This content is internal.
+		$content = str_replace(' target="_blank"','',$content);		
 	} 
 
 	$content = preg_replace_callback("/#include (.*?)\;/ism", 'preg_callback_help_include', $content);
@@ -248,7 +250,9 @@ function preg_callback_help_include($matches) {
 		if(preg_match('/\.bb$/', $matches[1]) || preg_match('/\.txt$/', $matches[1])) {
 			require_once('include/bbcode.php');
 			$include = bbcode($include);
-		} elseif(preg_match('/\.md$/', $matches[1])) {
+			$include = str_replace(' target="_blank"','',$include);		
+		} 
+		elseif(preg_match('/\.md$/', $matches[1])) {
 			require_once('library/markdown.php');
 			$include = Markdown($include);
 		}
diff --git a/mod/item.php b/mod/item.php
index f100c9dfe..fdc768c67 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -817,25 +817,26 @@ function item_post(&$a) {
 			dbesc($body)
 		);
 
-		if($z && $z[0]['created'] > datetime_convert('UTC','UTC', 'now - 2 minutes')) {
-			$datarray['cancel'] = 1;
-			notice( t('Duplicate post suppressed.') . EOL);
-			logger('Duplicate post. Faking plugin cancel.');
+		if($z) {
+			foreach($z as $zz) {
+				if($zz['created'] > datetime_convert('UTC','UTC', 'now - 2 minutes')) {
+					$datarray['cancel'] = 1;
+					notice( t('Duplicate post suppressed.') . EOL);
+					logger('Duplicate post. Faking plugin cancel.');
+				}
+			}
 		}
 	}
 
 	call_hooks('post_local',$datarray);
 
 	if(x($datarray,'cancel')) {
-		logger('mod_item: post cancelled by plugin.');
-		if($return_path) {
+		logger('mod_item: post cancelled by plugin or duplicate suppressed.');
+		if($return_path)
 			goaway($a->get_baseurl() . "/" . $return_path);
-		}
 
 		$json = array('cancel' => 1);
-		if(x($_REQUEST,'jsreload') && strlen($_REQUEST['jsreload']))
-			$json['reload'] = $a->get_baseurl() . '/' . $_REQUEST['jsreload'];
-
+		$json['reload'] = $a->get_baseurl() . '/' . $_REQUEST['jsreload'];
 		echo json_encode($json);
 		killme();
 	}
diff --git a/mod/linkinfo.php b/mod/linkinfo.php
index c3df1305d..d615b178f 100644
--- a/mod/linkinfo.php
+++ b/mod/linkinfo.php
@@ -113,7 +113,7 @@ function linkinfo_content(&$a) {
 
 	// If this is a Red site, use zrl rather than url so they get zids sent to them by default
 
-	if( x($siteinfo,'generator') && (strpos($siteinfo['generator'],PLATFORM_NAME . ' ') === 0))
+	if( x($siteinfo,'generator') && (strpos($siteinfo['generator'], get_platform_name() . ' ') === 0))
 		$template = str_replace('url','zrl',$template);
 
 	if($siteinfo["title"] == "") {
diff --git a/mod/lostpass.php b/mod/lostpass.php
index 3dbc2fe7d..ffdd7b62e 100644
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
@@ -87,7 +87,7 @@ function lostpass_content(&$a) {
 				'$lbl2' => t('Your password has been reset as requested.'),
 				'$lbl3' => t('Your new password is'),
 				'$lbl4' => t('Save or copy your new password - and then'),
-				'$lbl5' => '<a href="' . $a->get_baseurl() . '">' . t('click here to login') . '</a>.',
+				'$lbl5' => '<a href="' . $a->get_baseurl() . '/login">' . t('click here to login') . '</a>.',
 				'$lbl6' => t('Your password may be changed from the <em>Settings</em> page after successful login.'),
 				'$newpass' => $new_password,
 				'$baseurl' => $a->get_baseurl()
diff --git a/mod/settings.php b/mod/settings.php
index 275b2a96f..d2ba590a2 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -846,9 +846,9 @@ function settings_content(&$a) {
 			'$theme_config' => $theme_config,
 			'$expert' => feature_enabled(local_channel(),'expert'),
 			'$channel_list_mode' => array('channel_list_mode', t('Use blog/list mode on channel page'), get_pconfig(local_channel(),'system','channel_list_mode'), t('(comments displayed separately)'), $yes_no),
-			'$network_list_mode' => array('network_list_mode', t('Use blog/list mode on matrix page'), get_pconfig(local_channel(),'system','network_list_mode'), t('(comments displayed separately)'), $yes_no),
+			'$network_list_mode' => array('network_list_mode', t('Use blog/list mode on grid page'), get_pconfig(local_channel(),'system','network_list_mode'), t('(comments displayed separately)'), $yes_no),
 			'$channel_divmore_height' => array('channel_divmore_height', t('Channel page max height of content (in pixels)'), ((get_pconfig(local_channel(),'system','channel_divmore_height')) ? get_pconfig(local_channel(),'system','channel_divmore_height') : 400), t('click to expand content exceeding this height')),
-			'$network_divmore_height' => array('network_divmore_height', t('Matrix page max height of content (in pixels)'), ((get_pconfig(local_channel(),'system','network_divmore_height')) ? get_pconfig(local_channel(),'system','network_divmore_height') : 400) , t('click to expand content exceeding this height')),
+			'$network_divmore_height' => array('network_divmore_height', t('Grid page max height of content (in pixels)'), ((get_pconfig(local_channel(),'system','network_divmore_height')) ? get_pconfig(local_channel(),'system','network_divmore_height') : 400) , t('click to expand content exceeding this height')),
 
 
 		));
@@ -1084,7 +1084,7 @@ function settings_content(&$a) {
 
 			'$lbl_vnot' 	=> t('Show visual notifications including:'),
 
-			'$vnotify1'	=> array('vnotify1', t('Unseen matrix activity'), ($vnotify & VNOTIFY_NETWORK), VNOTIFY_NETWORK, '', $yes_no),
+			'$vnotify1'	=> array('vnotify1', t('Unseen grid activity'), ($vnotify & VNOTIFY_NETWORK), VNOTIFY_NETWORK, '', $yes_no),
 			'$vnotify2'	=> array('vnotify2', t('Unseen channel activity'), ($vnotify & VNOTIFY_CHANNEL), VNOTIFY_CHANNEL, '', $yes_no),
 			'$vnotify3'	=> array('vnotify3', t('Unseen private messages'), ($vnotify & VNOTIFY_MAIL), VNOTIFY_MAIL, t('Recommended'), $yes_no),
 			'$vnotify4'	=> array('vnotify4', t('Upcoming events'), ($vnotify & VNOTIFY_EVENT), VNOTIFY_EVENT, '', $yes_no),
diff --git a/mod/siteinfo.php b/mod/siteinfo.php
index 52d014de1..f7423506f 100644
--- a/mod/siteinfo.php
+++ b/mod/siteinfo.php
@@ -12,7 +12,7 @@ function siteinfo_init(&$a) {
 function siteinfo_content(&$a) {
 
 	if(! get_config('system','hidden_version_siteinfo')) {
-		$version = sprintf( t('Version %s'), RED_VERSION );
+		$version = sprintf( t('Version %s'), get_project_version());
 		if(@is_dir('.git') && function_exists('shell_exec')) {
 			$commit = @shell_exec('git log -1 --format="%h"');
 			$tag = get_std_version(); // @shell_exec('git describe --tags --abbrev=0');
diff --git a/util/shredder/JSON.sh b/util/shredder/JSON.sh
index 65f5f1f66..20c4d282e 100755
--- a/util/shredder/JSON.sh
+++ b/util/shredder/JSON.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 # The MIT License
 #
 # Copyright (c) 2011 Dominic Tarr
diff --git a/version.inc b/version.inc
index 84bd44ea2..2e8e8f4ff 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2016-01-17.1281H
+2016-01-21.1285H
diff --git a/view/cs/htconfig.tpl b/view/cs/htconfig.tpl
index cc4087f96..773125154 100644
--- a/view/cs/htconfig.tpl
+++ b/view/cs/htconfig.tpl
@@ -8,6 +8,7 @@ $db_port = '{{$dbport}}';
 $db_user = '{{$dbuser}}';
 $db_pass = '{{$dbpass}}';
 $db_data = '{{$dbdata}}';
+$db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres
 
 /*
  * Notice: Many of the following settings will be available in the admin panel 
diff --git a/view/de/htconfig.tpl b/view/de/htconfig.tpl
index 928694769..205da73a3 100644
--- a/view/de/htconfig.tpl
+++ b/view/de/htconfig.tpl
@@ -8,6 +8,7 @@ $db_port = '{{$dbport}}';
 $db_user = '{{$dbuser}}';
 $db_pass = '{{$dbpass}}';
 $db_data = '{{$dbdata}}';
+$db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres
 
 /*
  * Notice: Many of the following settings will be available in the admin panel 
diff --git a/view/en-au/htconfig.tpl b/view/en-au/htconfig.tpl
index c3bef0de3..9dd0a1ab2 100644
--- a/view/en-au/htconfig.tpl
+++ b/view/en-au/htconfig.tpl
@@ -8,6 +8,7 @@ $db_port = '{{$dbport}}';
 $db_user = '{{$dbuser}}';
 $db_pass = '{{$dbpass}}';
 $db_data = '{{$dbdata}}';
+$db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres
 
 /*
  * Notice: Many of the following settings will be available in the admin panel 
diff --git a/view/en-gb/htconfig.tpl b/view/en-gb/htconfig.tpl
index c3bef0de3..9dd0a1ab2 100644
--- a/view/en-gb/htconfig.tpl
+++ b/view/en-gb/htconfig.tpl
@@ -8,6 +8,7 @@ $db_port = '{{$dbport}}';
 $db_user = '{{$dbuser}}';
 $db_pass = '{{$dbpass}}';
 $db_data = '{{$dbdata}}';
+$db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres
 
 /*
  * Notice: Many of the following settings will be available in the admin panel 
diff --git a/view/eo/htconfig.tpl b/view/eo/htconfig.tpl
index cc4087f96..773125154 100644
--- a/view/eo/htconfig.tpl
+++ b/view/eo/htconfig.tpl
@@ -8,6 +8,7 @@ $db_port = '{{$dbport}}';
 $db_user = '{{$dbuser}}';
 $db_pass = '{{$dbpass}}';
 $db_data = '{{$dbdata}}';
+$db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres
 
 /*
  * Notice: Many of the following settings will be available in the admin panel 
diff --git a/view/es-es/hmessages.po b/view/es-es/hmessages.po
index 6ce628e10..0ce5687fc 100644
--- a/view/es-es/hmessages.po
+++ b/view/es-es/hmessages.po
@@ -4,6 +4,8 @@
 # 
 # Translators:
 # Alfonso <admin@alfonsomh.eu>, 2015
+# JACOB MALDONADO <axetransit@gmail.com>, 2015
+# jeroenpraat <jeroenpraat@xs4all.nl>, 2015
 # Manuel Jiménez Friaza <mjfriaza@openmailbox.org>, 2015-2016
 # Rafael, 2015
 # tony baldwin <tonybaldwin@gmx.com>, 2014
@@ -11,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Redmatrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-08 00:03-0800\n"
-"PO-Revision-Date: 2016-01-10 15:33+0000\n"
+"POT-Creation-Date: 2016-01-15 00:03-0800\n"
+"PO-Revision-Date: 2016-01-16 14:43+0000\n"
 "Last-Translator: Manuel Jiménez Friaza <mjfriaza@openmailbox.org>\n"
 "Language-Team: Spanish (Spain) (http://www.transifex.com/Friendica/red-matrix/language/es_ES/)\n"
 "MIME-Version: 1.0\n"
@@ -33,62 +35,62 @@ msgstr "La autenticación desde su servidor está bloqueada. Ha iniciado sesión
 msgid "Welcome %s. Remote authentication successful."
 msgstr "Bienvenido %s. La identificación desde su servidor se ha llevado a cabo correctamente."
 
-#: ../../boot.php:1304
+#: ../../boot.php:1319
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "La actualización %s ha fallado. Mire el informe de errores."
 
-#: ../../boot.php:1307
+#: ../../boot.php:1322
 #, php-format
 msgid "Update Error at %s"
 msgstr "Error de actualización en %s"
 
-#: ../../boot.php:1474
+#: ../../boot.php:1489
 msgid ""
 "Create an account to access services and applications within the Hubzilla"
 msgstr "Crear una cuenta para acceder a los servicios y aplicaciones dentro de Hubzilla"
 
-#: ../../boot.php:1475 ../../include/nav.php:149 ../../mod/register.php:226
+#: ../../boot.php:1490 ../../include/nav.php:149 ../../mod/register.php:264
 msgid "Register"
 msgstr "Registrarse"
 
-#: ../../boot.php:1492 ../../include/nav.php:82 ../../include/nav.php:114
+#: ../../boot.php:1507 ../../include/nav.php:82 ../../include/nav.php:114
 msgid "Logout"
 msgstr "Finalizar sesión"
 
-#: ../../boot.php:1493 ../../include/apps.php:131 ../../include/nav.php:111
+#: ../../boot.php:1508 ../../include/apps.php:131 ../../include/nav.php:111
 msgid "Login"
 msgstr "Iniciar sesión"
 
-#: ../../boot.php:1495 ../../include/contact_selectors.php:79
+#: ../../boot.php:1510 ../../include/contact_selectors.php:79
 #: ../../mod/admin.php:891 ../../mod/admin.php:900 ../../mod/id.php:15
 #: ../../mod/id.php:16
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: ../../boot.php:1496
+#: ../../boot.php:1511
 msgid "Password"
 msgstr "Contraseña"
 
-#: ../../boot.php:1497
+#: ../../boot.php:1512
 msgid "Remember me"
 msgstr "Recordarme"
 
-#: ../../boot.php:1497 ../../include/dir_fns.php:141
+#: ../../boot.php:1512 ../../include/dir_fns.php:141
 #: ../../include/dir_fns.php:142 ../../include/dir_fns.php:143
-#: ../../mod/admin.php:421 ../../mod/api.php:102 ../../mod/connedit.php:641
-#: ../../mod/connedit.php:690 ../../mod/events.php:447
+#: ../../mod/admin.php:421 ../../mod/api.php:102 ../../mod/events.php:447
 #: ../../mod/events.php:448 ../../mod/events.php:457
 #: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
 #: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/mitem.php:154
 #: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229
 #: ../../mod/photos.php:626 ../../mod/removeme.php:60
-#: ../../mod/settings.php:577 ../../view/theme/redbasic/php/config.php:104
+#: ../../mod/settings.php:577 ../../mod/connedit.php:644
+#: ../../mod/connedit.php:693 ../../view/theme/redbasic/php/config.php:104
 #: ../../view/theme/redbasic/php/config.php:129
 msgid "No"
 msgstr "No"
 
-#: ../../boot.php:1497 ../../include/dir_fns.php:141
+#: ../../boot.php:1512 ../../include/dir_fns.php:141
 #: ../../include/dir_fns.php:142 ../../include/dir_fns.php:143
 #: ../../mod/admin.php:423 ../../mod/api.php:101 ../../mod/events.php:447
 #: ../../mod/events.php:448 ../../mod/events.php:457
@@ -101,36 +103,36 @@ msgstr "No"
 msgid "Yes"
 msgstr "Sí"
 
-#: ../../boot.php:1500
+#: ../../boot.php:1515
 msgid "Forgot your password?"
 msgstr "¿Olvidó su contraseña?"
 
-#: ../../boot.php:1501 ../../mod/lostpass.php:86
+#: ../../boot.php:1516 ../../mod/lostpass.php:86
 msgid "Password Reset"
 msgstr "Restablecer la contraseña"
 
-#: ../../boot.php:2120
+#: ../../boot.php:2137
 msgid "toggle mobile"
 msgstr "cambiar a modo móvil"
 
-#: ../../boot.php:2272
+#: ../../boot.php:2289
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr "El certificado SSL del sitio web no es válido. Por favor, solucione el problema."
 
-#: ../../boot.php:2275
+#: ../../boot.php:2292
 #, php-format
 msgid "[hubzilla] Website SSL error for %s"
 msgstr "[hubzilla] Error SSL del sitio web en %s"
 
-#: ../../boot.php:2312
+#: ../../boot.php:2329
 msgid "Cron/Scheduled tasks not running."
 msgstr "Las tareas del Planificador/Cron no están funcionando."
 
-#: ../../boot.php:2313 ../../include/datetime.php:263
+#: ../../boot.php:2330 ../../include/datetime.php:263
 msgid "never"
 msgstr "nunca"
 
-#: ../../boot.php:2316
+#: ../../boot.php:2333
 #, php-format
 msgid "[hubzilla] Cron tasks not running on %s"
 msgstr "[hubzilla] Las tareas de Cron no están funcionando en %s"
@@ -174,8 +176,8 @@ msgstr "Mensaje Privado"
 #: ../../include/ItemObject.php:100 ../../include/RedDAV/RedBrowser.php:240
 #: ../../include/apps.php:259 ../../include/menu.php:108
 #: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36
-#: ../../mod/blocks.php:153 ../../mod/connections.php:235
-#: ../../mod/connections.php:248 ../../mod/connections.php:267
+#: ../../mod/blocks.php:153 ../../mod/connections.php:262
+#: ../../mod/connections.php:281 ../../mod/connections.php:301
 #: ../../mod/editblock.php:135 ../../mod/editlayout.php:134
 #: ../../mod/editpost.php:112 ../../mod/editwebpage.php:176
 #: ../../mod/layouts.php:183 ../../mod/menu.php:108 ../../mod/settings.php:648
@@ -186,11 +188,11 @@ msgstr "Editar"
 #: ../../include/ItemObject.php:120 ../../include/RedDAV/RedBrowser.php:241
 #: ../../include/apps.php:260 ../../include/conversation.php:657
 #: ../../mod/admin.php:895 ../../mod/admin.php:1054 ../../mod/blocks.php:155
-#: ../../mod/connedit.php:557 ../../mod/editblock.php:181
+#: ../../mod/connections.php:263 ../../mod/editblock.php:181
 #: ../../mod/editlayout.php:179 ../../mod/editwebpage.php:223
 #: ../../mod/group.php:173 ../../mod/photos.php:1126
-#: ../../mod/settings.php:649 ../../mod/thing.php:258
-#: ../../mod/webpages.php:183
+#: ../../mod/settings.php:649 ../../mod/connedit.php:560
+#: ../../mod/thing.php:258 ../../mod/webpages.php:183
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -279,7 +281,7 @@ msgstr "Añadir etiqueta"
 
 #: ../../include/ItemObject.php:254 ../../mod/photos.php:1023
 msgid "I like this (toggle)"
-msgstr "me gusta (cambiar)"
+msgstr "Me gusta (cambiar)"
 
 #: ../../include/ItemObject.php:254 ../../include/taxonomy.php:328
 msgid "like"
@@ -399,12 +401,11 @@ msgstr "Comentar"
 #: ../../include/ItemObject.php:697 ../../include/js_strings.php:22
 #: ../../include/widgets.php:679 ../../include/widgets.php:691
 #: ../../mod/admin.php:453 ../../mod/admin.php:596 ../../mod/admin.php:888
-#: ../../mod/admin.php:1052 ../../mod/admin.php:1189 ../../mod/admin.php:1383
-#: ../../mod/admin.php:1468 ../../mod/appman.php:99 ../../mod/chat.php:184
-#: ../../mod/chat.php:213 ../../mod/connect.php:93 ../../mod/connedit.php:721
-#: ../../mod/events.php:461 ../../mod/events.php:658
-#: ../../mod/filestorage.php:156 ../../mod/fsuggest.php:108
-#: ../../mod/group.php:81 ../../mod/import.php:527
+#: ../../mod/admin.php:1052 ../../mod/admin.php:1228 ../../mod/admin.php:1423
+#: ../../mod/admin.php:1508 ../../mod/appman.php:99 ../../mod/chat.php:184
+#: ../../mod/chat.php:213 ../../mod/connect.php:93 ../../mod/events.php:461
+#: ../../mod/events.php:658 ../../mod/filestorage.php:156
+#: ../../mod/fsuggest.php:108 ../../mod/group.php:81 ../../mod/import.php:527
 #: ../../mod/import_items.php:122 ../../mod/invite.php:142
 #: ../../mod/locs.php:116 ../../mod/mail.php:380 ../../mod/mitem.php:231
 #: ../../mod/mood.php:135 ../../mod/pconfig.php:108 ../../mod/pdledit.php:58
@@ -414,9 +415,10 @@ msgstr "Comentar"
 #: ../../mod/settings.php:586 ../../mod/settings.php:698
 #: ../../mod/settings.php:726 ../../mod/settings.php:749
 #: ../../mod/settings.php:834 ../../mod/settings.php:1023
-#: ../../mod/setup.php:331 ../../mod/setup.php:371 ../../mod/sources.php:104
-#: ../../mod/sources.php:138 ../../mod/thing.php:313 ../../mod/thing.php:359
-#: ../../mod/xchan.php:11 ../../view/theme/redbasic/php/config.php:99
+#: ../../mod/setup.php:331 ../../mod/setup.php:371 ../../mod/connedit.php:724
+#: ../../mod/sources.php:104 ../../mod/sources.php:138 ../../mod/thing.php:313
+#: ../../mod/thing.php:359 ../../mod/xchan.php:11
+#: ../../view/theme/redbasic/php/config.php:99
 msgid "Submit"
 msgstr "Enviar"
 
@@ -506,7 +508,7 @@ msgstr "Programar bandeja de salida"
 
 #: ../../include/RedDAV/RedBrowser.php:164 ../../include/apps.php:360
 #: ../../include/apps.php:415 ../../include/conversation.php:1027
-#: ../../include/widgets.php:1334 ../../mod/photos.php:754
+#: ../../include/widgets.php:1366 ../../mod/photos.php:754
 #: ../../mod/photos.php:1195
 msgid "Unknown"
 msgstr "Desconocido"
@@ -528,14 +530,15 @@ msgstr "Compartido"
 #: ../../include/RedDAV/RedBrowser.php:230
 #: ../../include/RedDAV/RedBrowser.php:303 ../../mod/blocks.php:152
 #: ../../mod/layouts.php:175 ../../mod/menu.php:114
-#: ../../mod/new_channel.php:133 ../../mod/webpages.php:180
+#: ../../mod/new_channel.php:133 ../../mod/register.php:255
+#: ../../mod/webpages.php:180
 msgid "Create"
 msgstr "Crear"
 
 #: ../../include/RedDAV/RedBrowser.php:231
-#: ../../include/RedDAV/RedBrowser.php:305 ../../include/widgets.php:1347
+#: ../../include/RedDAV/RedBrowser.php:305 ../../include/widgets.php:1379
 #: ../../mod/photos.php:781 ../../mod/photos.php:1316
-#: ../../mod/profile_photo.php:453
+#: ../../mod/profile_photo.php:453 ../../mod/cover_photo.php:353
 msgid "Upload"
 msgstr "Subir"
 
@@ -580,80 +583,80 @@ msgstr "Crear nueva carpeta"
 msgid "Upload file"
 msgstr "Subir fichero"
 
-#: ../../include/account.php:27
+#: ../../include/account.php:28
 msgid "Not a valid email address"
 msgstr "Dirección de correo no válida"
 
-#: ../../include/account.php:29
+#: ../../include/account.php:30
 msgid "Your email domain is not among those allowed on this site"
 msgstr "Su dirección de correo no pertenece a ninguno de los dominios permitidos en este sitio."
 
-#: ../../include/account.php:35
+#: ../../include/account.php:36
 msgid "Your email address is already registered at this site."
 msgstr "Su dirección de correo está ya registrada en este sitio."
 
-#: ../../include/account.php:67
+#: ../../include/account.php:68
 msgid "An invitation is required."
 msgstr "Es obligatorio que le inviten."
 
-#: ../../include/account.php:71
+#: ../../include/account.php:72
 msgid "Invitation could not be verified."
 msgstr "No se ha podido verificar su invitación."
 
-#: ../../include/account.php:121
+#: ../../include/account.php:122
 msgid "Please enter the required information."
 msgstr "Por favor introduzca la información requerida."
 
-#: ../../include/account.php:188
+#: ../../include/account.php:189
 msgid "Failed to store account information."
 msgstr "La información de la cuenta no se ha podido guardar."
 
-#: ../../include/account.php:248
+#: ../../include/account.php:249
 #, php-format
 msgid "Registration confirmation for %s"
 msgstr "Confirmación de registro para %s"
 
-#: ../../include/account.php:314
+#: ../../include/account.php:315
 #, php-format
 msgid "Registration request at %s"
 msgstr "Solicitud de registro en %s"
 
-#: ../../include/account.php:316 ../../include/account.php:343
-#: ../../include/account.php:403 ../../include/network.php:1655
+#: ../../include/account.php:317 ../../include/account.php:344
+#: ../../include/account.php:404 ../../include/network.php:1659
 msgid "Administrator"
 msgstr "Administrador"
 
-#: ../../include/account.php:338
+#: ../../include/account.php:339
 msgid "your registration password"
 msgstr "su contraseña de registro"
 
-#: ../../include/account.php:341 ../../include/account.php:401
+#: ../../include/account.php:342 ../../include/account.php:402
 #, php-format
 msgid "Registration details for %s"
 msgstr "Detalles del registro de %s"
 
-#: ../../include/account.php:410
+#: ../../include/account.php:414
 msgid "Account approved."
 msgstr "Cuenta aprobada."
 
-#: ../../include/account.php:449
+#: ../../include/account.php:454
 #, php-format
 msgid "Registration revoked for %s"
 msgstr "Registro revocado para %s"
 
-#: ../../include/account.php:494
+#: ../../include/account.php:506
 msgid "Account verified. Please login."
 msgstr "Cuenta verificada. Por favor, inicie sesión."
 
-#: ../../include/account.php:707 ../../include/account.php:709
+#: ../../include/account.php:719 ../../include/account.php:721
 msgid "Click here to upgrade."
 msgstr "Pulse aquí para actualizar"
 
-#: ../../include/account.php:715
+#: ../../include/account.php:727
 msgid "This action exceeds the limits set by your subscription plan."
 msgstr "Esta acción supera los límites establecidos por su plan de suscripción "
 
-#: ../../include/account.php:720
+#: ../../include/account.php:732
 msgid "This action is not available under your subscription plan."
 msgstr "Esta acción no está disponible en su plan de suscripción."
 
@@ -729,8 +732,8 @@ msgid "Grid"
 msgstr "Red"
 
 #: ../../include/apps.php:134 ../../include/nav.php:202
-#: ../../include/widgets.php:557 ../../mod/admin.php:1150
-#: ../../mod/admin.php:1350
+#: ../../include/widgets.php:557 ../../mod/admin.php:1168
+#: ../../mod/admin.php:1390
 msgid "Settings"
 msgstr "Ajustes"
 
@@ -784,7 +787,7 @@ msgstr "Chat"
 
 #: ../../include/apps.php:147 ../../include/nav.php:159
 #: ../../include/text.php:885 ../../include/text.php:897
-#: ../../mod/search.php:40
+#: ../../mod/connections.php:297 ../../mod/search.php:40
 msgid "Search"
 msgstr "Buscar"
 
@@ -804,7 +807,7 @@ msgstr "Canal aleatorio"
 msgid "Invite"
 msgstr "Invitar"
 
-#: ../../include/apps.php:152 ../../include/widgets.php:1220
+#: ../../include/apps.php:152 ../../include/widgets.php:1252
 msgid "Features"
 msgstr "Funcionalidades"
 
@@ -841,40 +844,41 @@ msgstr "Comprar"
 #: ../../include/attach.php:436 ../../include/attach.php:888
 #: ../../include/attach.php:959 ../../include/attach.php:1111
 #: ../../include/chat.php:133 ../../include/items.php:4405
-#: ../../include/photos.php:29 ../../index.php:182 ../../index.php:365
+#: ../../include/photos.php:29 ../../index.php:182 ../../index.php:367
 #: ../../mod/achievements.php:30 ../../mod/api.php:26 ../../mod/api.php:31
 #: ../../mod/appman.php:66 ../../mod/authtest.php:13 ../../mod/block.php:22
 #: ../../mod/block.php:72 ../../mod/blocks.php:69 ../../mod/blocks.php:76
 #: ../../mod/bookmarks.php:48 ../../mod/channel.php:100
 #: ../../mod/channel.php:214 ../../mod/channel.php:254 ../../mod/chat.php:94
 #: ../../mod/chat.php:99 ../../mod/common.php:35 ../../mod/connections.php:29
-#: ../../mod/connedit.php:352 ../../mod/editblock.php:65
-#: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87
-#: ../../mod/editpost.php:13 ../../mod/editwebpage.php:64
-#: ../../mod/editwebpage.php:86 ../../mod/editwebpage.php:101
-#: ../../mod/editwebpage.php:125 ../../mod/events.php:260
-#: ../../mod/filestorage.php:18 ../../mod/filestorage.php:73
-#: ../../mod/filestorage.php:88 ../../mod/filestorage.php:115
-#: ../../mod/fsuggest.php:78 ../../mod/group.php:9 ../../mod/id.php:71
-#: ../../mod/invite.php:13 ../../mod/invite.php:87 ../../mod/item.php:206
-#: ../../mod/item.php:214 ../../mod/item.php:1049 ../../mod/layouts.php:69
-#: ../../mod/layouts.php:76 ../../mod/layouts.php:87 ../../mod/like.php:177
-#: ../../mod/locs.php:83 ../../mod/mail.php:126 ../../mod/manage.php:6
-#: ../../mod/menu.php:74 ../../mod/message.php:16 ../../mod/mitem.php:111
-#: ../../mod/mood.php:112 ../../mod/network.php:12
-#: ../../mod/new_channel.php:68 ../../mod/new_channel.php:99
-#: ../../mod/notifications.php:66 ../../mod/page.php:31 ../../mod/page.php:86
-#: ../../mod/pdledit.php:21 ../../mod/photos.php:70 ../../mod/poke.php:133
-#: ../../mod/profile.php:64 ../../mod/profile.php:72
-#: ../../mod/profile_photo.php:341 ../../mod/profile_photo.php:354
-#: ../../mod/profiles.php:198 ../../mod/profiles.php:584
-#: ../../mod/rate.php:111 ../../mod/register.php:72 ../../mod/regmod.php:17
-#: ../../mod/service_limits.php:7 ../../mod/settings.php:568
-#: ../../mod/setup.php:227 ../../mod/sharedwithme.php:7
+#: ../../mod/editblock.php:65 ../../mod/editlayout.php:63
+#: ../../mod/editlayout.php:87 ../../mod/editpost.php:13
+#: ../../mod/editwebpage.php:64 ../../mod/editwebpage.php:86
+#: ../../mod/editwebpage.php:101 ../../mod/editwebpage.php:125
+#: ../../mod/events.php:260 ../../mod/filestorage.php:18
+#: ../../mod/filestorage.php:73 ../../mod/filestorage.php:88
+#: ../../mod/filestorage.php:115 ../../mod/fsuggest.php:78
+#: ../../mod/group.php:9 ../../mod/id.php:71 ../../mod/invite.php:13
+#: ../../mod/invite.php:87 ../../mod/item.php:206 ../../mod/item.php:214
+#: ../../mod/item.php:1049 ../../mod/layouts.php:69 ../../mod/layouts.php:76
+#: ../../mod/layouts.php:87 ../../mod/like.php:177 ../../mod/locs.php:83
+#: ../../mod/mail.php:126 ../../mod/manage.php:6 ../../mod/menu.php:74
+#: ../../mod/message.php:16 ../../mod/mitem.php:111 ../../mod/mood.php:112
+#: ../../mod/network.php:12 ../../mod/new_channel.php:68
+#: ../../mod/new_channel.php:99 ../../mod/notifications.php:66
+#: ../../mod/page.php:31 ../../mod/page.php:86 ../../mod/pdledit.php:21
+#: ../../mod/photos.php:70 ../../mod/poke.php:133 ../../mod/profile.php:64
+#: ../../mod/profile.php:72 ../../mod/profile_photo.php:341
+#: ../../mod/profile_photo.php:354 ../../mod/profiles.php:198
+#: ../../mod/profiles.php:584 ../../mod/rate.php:111 ../../mod/register.php:73
+#: ../../mod/regmod.php:17 ../../mod/service_limits.php:7
+#: ../../mod/settings.php:568 ../../mod/setup.php:227
+#: ../../mod/connedit.php:355 ../../mod/sharedwithme.php:7
 #: ../../mod/sources.php:66 ../../mod/suggest.php:26 ../../mod/thing.php:271
 #: ../../mod/thing.php:291 ../../mod/thing.php:328
 #: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
 #: ../../mod/viewsrc.php:14 ../../mod/webpages.php:69
+#: ../../mod/cover_photo.php:273 ../../mod/cover_photo.php:286
 msgid "Permission denied."
 msgstr "Acceso denegado."
 
@@ -1160,7 +1164,7 @@ msgstr "Conectar/Seguir"
 msgid "Examples: Robert Morgenstein, Fishing"
 msgstr "Ejemplos: José Fernández, Pesca"
 
-#: ../../include/contact_widgets.php:26 ../../mod/connections.php:266
+#: ../../include/contact_widgets.php:26 ../../mod/connections.php:300
 #: ../../mod/directory.php:381 ../../mod/directory.php:386
 msgid "Find"
 msgstr "Encontrar"
@@ -1236,12 +1240,12 @@ msgstr "el comentario"
 #: ../../include/conversation.php:164 ../../mod/like.php:410
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
-msgstr "a %1$s le gusta %3$s de %2$s"
+msgstr "A %1$s le gusta %3$s de %2$s"
 
 #: ../../include/conversation.php:167 ../../mod/like.php:412
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
-msgstr "a %1$s no le gusta %3$s de %2$s"
+msgstr "A %1$s no le gusta %3$s de %2$s"
 
 #: ../../include/conversation.php:204
 #, php-format
@@ -1349,7 +1353,7 @@ msgid "View Status"
 msgstr "Ver mi estado actual"
 
 #: ../../include/conversation.php:950 ../../include/nav.php:86
-#: ../../mod/connedit.php:504
+#: ../../mod/connedit.php:507
 msgid "View Profile"
 msgstr "Ver el perfil"
 
@@ -1372,26 +1376,26 @@ msgstr "Enviar un mensaje privado"
 #: ../../include/conversation.php:1070
 #, php-format
 msgid "%s likes this."
-msgstr "a %s le gusta esto."
+msgstr "A %s le gusta esto."
 
 #: ../../include/conversation.php:1070
 #, php-format
 msgid "%s doesn't like this."
-msgstr "a %s no le gusta esto."
+msgstr "A %s no le gusta esto."
 
 #: ../../include/conversation.php:1074
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgid_plural "<span  %1$s>%2$d people</span> like this."
 msgstr[0] "a <span %1$s>%2$d personas</span> le gusta esto."
-msgstr[1] "a <span  %1$s>%2$d personas</span> les gusta esto."
+msgstr[1] "A <span  %1$s>%2$d personas</span> les gusta esto."
 
 #: ../../include/conversation.php:1076
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgid_plural "<span  %1$s>%2$d people</span> don't like this."
 msgstr[0] "a <span %1$s>%2$d personas</span> no les gusta esto."
-msgstr[1] "a <span  %1$s>%2$d personas</span> no les gusta esto."
+msgstr[1] "A <span  %1$s>%2$d personas</span> no les gusta esto."
 
 #: ../../include/conversation.php:1082
 msgid "and"
@@ -1407,12 +1411,12 @@ msgstr[1] ", y %d personas más"
 #: ../../include/conversation.php:1086
 #, php-format
 msgid "%s like this."
-msgstr "a %s le gusta esto."
+msgstr "A %s le gusta esto."
 
 #: ../../include/conversation.php:1086
 #, php-format
 msgid "%s don't like this."
-msgstr "a %s no le gusta esto."
+msgstr "A %s no le gusta esto."
 
 #: ../../include/conversation.php:1154
 msgid "Visible to <strong>everybody</strong>"
@@ -1831,19 +1835,19 @@ msgstr "Solo foros públicos"
 msgid "This Website Only"
 msgstr "Solo este sitio web"
 
-#: ../../include/enotify.php:57 ../../include/network.php:1608
+#: ../../include/enotify.php:57 ../../include/network.php:1612
 msgid "$Projectname Notification"
 msgstr "Notificación de $Projectname"
 
-#: ../../include/enotify.php:58 ../../include/network.php:1609
+#: ../../include/enotify.php:58 ../../include/network.php:1613
 msgid "$projectname"
 msgstr "$projectname"
 
-#: ../../include/enotify.php:60 ../../include/network.php:1611
+#: ../../include/enotify.php:60 ../../include/network.php:1615
 msgid "Thank You,"
 msgstr "Gracias,"
 
-#: ../../include/enotify.php:62 ../../include/network.php:1613
+#: ../../include/enotify.php:62 ../../include/network.php:1617
 #, php-format
 msgid "%s Administrator"
 msgstr "%s Administrador"
@@ -2277,7 +2281,7 @@ msgstr "Gestión de entradas y comentarios"
 
 #: ../../include/features.php:90
 msgid "Community Tagging"
-msgstr "Etiquetado de la comunidad"
+msgstr "Etiquetas de la comunidad"
 
 #: ../../include/features.php:90
 msgid "Ability to tag existing posts"
@@ -2429,10 +2433,10 @@ msgstr "Perfil principal"
 
 #: ../../include/identity.php:390 ../../include/identity.php:391
 #: ../../include/identity.php:398 ../../include/profile_selectors.php:80
-#: ../../include/widgets.php:430 ../../mod/connedit.php:579
-#: ../../mod/settings.php:338 ../../mod/settings.php:342
-#: ../../mod/settings.php:343 ../../mod/settings.php:346
-#: ../../mod/settings.php:357
+#: ../../include/widgets.php:430 ../../mod/settings.php:338
+#: ../../mod/settings.php:342 ../../mod/settings.php:343
+#: ../../mod/settings.php:346 ../../mod/settings.php:357
+#: ../../mod/connedit.php:582
 msgid "Friends"
 msgstr "Amigos/as"
 
@@ -2637,6 +2641,10 @@ msgstr "Estudios:"
 msgid "Like this thing"
 msgstr "Me gusta esto"
 
+#: ../../include/identity.php:1759 ../../mod/cover_photo.php:236
+msgid "cover photo"
+msgstr "Imagen de portada del perfil"
+
 #: ../../include/import.php:23
 msgid ""
 "Cannot create a duplicate channel identifier on this system. Import failed."
@@ -2650,7 +2658,7 @@ msgstr "La clonación del canal no ha salido bien. La importación ha fallado."
 msgid "Cloned channel not found. Import failed."
 msgstr "No se ha podido importar el canal porque el canal clonado no se ha encontrado."
 
-#: ../../include/items.php:423 ../../index.php:364 ../../mod/dreport.php:6
+#: ../../include/items.php:423 ../../index.php:366 ../../mod/dreport.php:6
 #: ../../mod/dreport.php:45 ../../mod/group.php:68
 #: ../../mod/import_items.php:114 ../../mod/like.php:280
 #: ../../mod/profperm.php:23 ../../mod/subthread.php:58
@@ -2695,7 +2703,7 @@ msgid "Visible to specific connections."
 msgstr "Visible para conexiones específicas."
 
 #: ../../include/items.php:4326 ../../mod/admin.php:135
-#: ../../mod/admin.php:1091 ../../mod/admin.php:1296 ../../mod/display.php:36
+#: ../../mod/admin.php:1091 ../../mod/admin.php:1336 ../../mod/display.php:36
 #: ../../mod/filestorage.php:27 ../../mod/thing.php:86
 #: ../../mod/viewsrc.php:20
 msgid "Item not found."
@@ -2714,7 +2722,7 @@ msgstr "La colección está vacía."
 msgid "Collection: %s"
 msgstr "Colección: %s"
 
-#: ../../include/items.php:4871 ../../mod/connedit.php:689
+#: ../../include/items.php:4871 ../../mod/connedit.php:692
 #, php-format
 msgid "Connection: %s"
 msgstr "Conexión: %s"
@@ -2775,8 +2783,8 @@ msgstr "Nada nuevo por aquí"
 msgid "Rate This Channel (this is public)"
 msgstr "Valorar este canal (esto es público)"
 
-#: ../../include/js_strings.php:20 ../../mod/connedit.php:700
-#: ../../mod/rate.php:157
+#: ../../include/js_strings.php:20 ../../mod/rate.php:157
+#: ../../mod/connedit.php:703
 msgid "Rating"
 msgstr "Valoración"
 
@@ -3049,19 +3057,19 @@ msgctxt "calendar"
 msgid "All day"
 msgstr "Todos los días"
 
-#: ../../include/message.php:19
+#: ../../include/message.php:20
 msgid "No recipient provided."
 msgstr "No se ha especificado ningún destinatario."
 
-#: ../../include/message.php:24
+#: ../../include/message.php:25
 msgid "[no subject]"
 msgstr "[sin asunto]"
 
-#: ../../include/message.php:44
+#: ../../include/message.php:45
 msgid "Unable to determine sender."
 msgstr "No ha sido posible determinar el remitente. "
 
-#: ../../include/message.php:219
+#: ../../include/message.php:222
 msgid "Stored post could not be verified."
 msgstr "No se han podido verificar las publicaciones guardadas."
 
@@ -3175,7 +3183,7 @@ msgstr "Mi canal"
 msgid "Mark all channel notifications seen"
 msgstr "Marcar todas las notificaciones del canal como leídas"
 
-#: ../../include/nav.php:181 ../../mod/connections.php:260
+#: ../../include/nav.php:181 ../../mod/connections.php:293
 msgid "Connections"
 msgstr "Conexiones"
 
@@ -3239,7 +3247,7 @@ msgstr "Gestionar sus canales"
 msgid "Account/Channel Settings"
 msgstr "Ajustes de cuenta/canales"
 
-#: ../../include/nav.php:210 ../../include/widgets.php:1247
+#: ../../include/nav.php:210 ../../include/widgets.php:1279
 msgid "Admin"
 msgstr "Administrador"
 
@@ -3259,7 +3267,7 @@ msgstr "Espere por favor…"
 msgid "view full size"
 msgstr "Ver en el tamaño original"
 
-#: ../../include/network.php:1669
+#: ../../include/network.php:1673
 msgid "No Subject"
 msgstr "Sin asunto"
 
@@ -3441,7 +3449,7 @@ msgstr "Otro"
 msgid "Custom/Expert Mode"
 msgstr "Modo personalizado/experto"
 
-#: ../../include/photo/photo_driver.php:719 ../../mod/photos.php:94
+#: ../../include/photo/photo_driver.php:722 ../../mod/photos.php:94
 #: ../../mod/photos.php:699 ../../mod/profile_photo.php:147
 #: ../../mod/profile_photo.php:239 ../../mod/profile_photo.php:379
 msgid "Profile Photos"
@@ -3457,6 +3465,7 @@ msgid "Image file is empty."
 msgstr "El fichero de imagen está vacío. "
 
 #: ../../include/photos.php:146 ../../mod/profile_photo.php:225
+#: ../../mod/cover_photo.php:164
 msgid "Unable to process image"
 msgstr "No ha sido posible procesar la imagen"
 
@@ -3792,8 +3801,8 @@ msgid "View Connections"
 msgstr "Ver conexiones"
 
 #: ../../include/text.php:886 ../../include/text.php:898
-#: ../../include/widgets.php:192 ../../mod/admin.php:1528
-#: ../../mod/admin.php:1548 ../../mod/filer.php:49 ../../mod/rbmark.php:28
+#: ../../include/widgets.php:192 ../../mod/admin.php:1568
+#: ../../mod/admin.php:1588 ../../mod/filer.php:49 ../../mod/rbmark.php:28
 #: ../../mod/rbmark.php:100
 msgid "Save"
 msgstr "Guardar"
@@ -3998,6 +4007,23 @@ msgstr "Formato gráfico"
 msgid "Pages"
 msgstr "Páginas"
 
+#: ../../include/zot.php:676
+msgid "Invalid data packet"
+msgstr "Paquete de datos no válido"
+
+#: ../../include/zot.php:692
+msgid "Unable to verify channel signature"
+msgstr "No ha sido posible de verificar la firma del canal"
+
+#: ../../include/zot.php:2268
+#, php-format
+msgid "Unable to verify site signature for %s"
+msgstr "No ha sido posible de verificar la firma del sitio para %s"
+
+#: ../../include/zot.php:3584
+msgid "invalid target signature"
+msgstr "La firma recibida no es válida"
+
 #: ../../include/widgets.php:93
 msgid "System"
 msgstr "Sistema"
@@ -4014,7 +4040,7 @@ msgstr "Editar una aplicación personal"
 msgid "Ignore/Hide"
 msgstr "Ignorar/Ocultar"
 
-#: ../../include/widgets.php:144 ../../mod/connections.php:125
+#: ../../include/widgets.php:144
 msgid "Suggestions"
 msgstr "Sugerencias"
 
@@ -4032,12 +4058,12 @@ msgid "Add New Connection"
 msgstr "Añadir nueva conexión"
 
 #: ../../include/widgets.php:173
-msgid "Enter the channel address"
-msgstr "Introducir la dirección del canal"
+msgid "Enter channel address"
+msgstr "Dirección del canal"
 
 #: ../../include/widgets.php:174
-msgid "Example: bob@example.com, http://example.com/barbara"
-msgstr "Ejemplo: paco@ejemplo.com, http://ejemplo.com/paco"
+msgid "Examples: bob@example.com, https://example.com/barbara"
+msgstr "Ejemplos: manuel@ejemplo.com, https://ejemplo.com/carmen"
 
 #: ../../include/widgets.php:190
 msgid "Notes"
@@ -4051,20 +4077,20 @@ msgstr "Eliminar término"
 msgid "Archives"
 msgstr "Hemeroteca"
 
-#: ../../include/widgets.php:428 ../../mod/connedit.php:577
+#: ../../include/widgets.php:428 ../../mod/connedit.php:580
 msgid "Me"
 msgstr "Yo"
 
-#: ../../include/widgets.php:429 ../../mod/connedit.php:578
+#: ../../include/widgets.php:429 ../../mod/connedit.php:581
 msgid "Family"
 msgstr "Familia"
 
-#: ../../include/widgets.php:431 ../../mod/connedit.php:580
+#: ../../include/widgets.php:431 ../../mod/connedit.php:583
 msgid "Acquaintances"
 msgstr "Conocidos/as"
 
 #: ../../include/widgets.php:432 ../../mod/connections.php:88
-#: ../../mod/connections.php:103 ../../mod/connedit.php:581
+#: ../../mod/connections.php:103 ../../mod/connedit.php:584
 msgid "All"
 msgstr "Todos/as"
 
@@ -4100,7 +4126,7 @@ msgstr "Aplicaciones conectadas"
 msgid "Export channel"
 msgstr "Exportar canal"
 
-#: ../../include/widgets.php:533 ../../mod/connedit.php:689
+#: ../../include/widgets.php:533 ../../mod/connedit.php:692
 msgid "Connection Default Permissions"
 msgstr "Permisos predeterminados de conexión"
 
@@ -4184,123 +4210,106 @@ msgstr "Salas de chat preferidas"
 msgid "Suggested Chatrooms"
 msgstr "Salas de chat sugeridas"
 
-#: ../../include/widgets.php:931 ../../include/widgets.php:989
+#: ../../include/widgets.php:931 ../../include/widgets.php:1021
 msgid "photo/image"
 msgstr "foto/imagen"
 
-#: ../../include/widgets.php:1084 ../../include/widgets.php:1086
+#: ../../include/widgets.php:1116 ../../include/widgets.php:1118
 msgid "Rate Me"
 msgstr "Valorar este canal"
 
-#: ../../include/widgets.php:1090
+#: ../../include/widgets.php:1122
 msgid "View Ratings"
 msgstr "Mostrar las valoraciones"
 
-#: ../../include/widgets.php:1101
+#: ../../include/widgets.php:1133
 msgid "Public Hubs"
 msgstr "Servidores públicos"
 
-#: ../../include/widgets.php:1149
+#: ../../include/widgets.php:1181
 msgid "Forums"
 msgstr "Foros"
 
-#: ../../include/widgets.php:1178
+#: ../../include/widgets.php:1210
 msgid "Tasks"
 msgstr "Tareas"
 
-#: ../../include/widgets.php:1187
+#: ../../include/widgets.php:1219
 msgid "Documentation"
 msgstr "Documentación"
 
-#: ../../include/widgets.php:1189
+#: ../../include/widgets.php:1221
 msgid "Project/Site Information"
 msgstr "Información sobre el proyecto o sitio"
 
-#: ../../include/widgets.php:1190
+#: ../../include/widgets.php:1222
 msgid "For Members"
 msgstr "Para los usuarios"
 
-#: ../../include/widgets.php:1191
+#: ../../include/widgets.php:1223
 msgid "For Administrators"
 msgstr "Para los administradores"
 
-#: ../../include/widgets.php:1192
+#: ../../include/widgets.php:1224
 msgid "For Developers"
 msgstr "Para los desarrolladores"
 
-#: ../../include/widgets.php:1217 ../../mod/admin.php:452
+#: ../../include/widgets.php:1249 ../../mod/admin.php:452
 msgid "Site"
 msgstr "Sitio"
 
-#: ../../include/widgets.php:1218
+#: ../../include/widgets.php:1250
 msgid "Accounts"
 msgstr "Cuentas"
 
-#: ../../include/widgets.php:1219 ../../mod/admin.php:1051
+#: ../../include/widgets.php:1251 ../../mod/admin.php:1051
 msgid "Channels"
 msgstr "Canales"
 
-#: ../../include/widgets.php:1221 ../../mod/admin.php:1148
-#: ../../mod/admin.php:1188
+#: ../../include/widgets.php:1253 ../../mod/admin.php:1166
+#: ../../mod/admin.php:1227
 msgid "Plugins"
 msgstr "Extensiones"
 
-#: ../../include/widgets.php:1222 ../../mod/admin.php:1348
-#: ../../mod/admin.php:1382
+#: ../../include/widgets.php:1254 ../../mod/admin.php:1388
+#: ../../mod/admin.php:1422
 msgid "Themes"
 msgstr "Temas"
 
-#: ../../include/widgets.php:1223
+#: ../../include/widgets.php:1255
 msgid "Inspect queue"
 msgstr "Examinar la cola"
 
-#: ../../include/widgets.php:1224
+#: ../../include/widgets.php:1256
 msgid "Profile Config"
 msgstr "Ajustes del perfil"
 
-#: ../../include/widgets.php:1225
+#: ../../include/widgets.php:1257
 msgid "DB updates"
 msgstr "Actualizaciones de la base de datos"
 
-#: ../../include/widgets.php:1243 ../../include/widgets.php:1249
-#: ../../mod/admin.php:1467
+#: ../../include/widgets.php:1275 ../../include/widgets.php:1281
+#: ../../mod/admin.php:1507
 msgid "Logs"
 msgstr "Informes"
 
-#: ../../include/widgets.php:1248
+#: ../../include/widgets.php:1280
 msgid "Plugin Features"
 msgstr "Extensiones"
 
-#: ../../include/widgets.php:1250
+#: ../../include/widgets.php:1282
 msgid "User registrations waiting for confirmation"
 msgstr "Registros de usuarios pendientes de confirmación"
 
-#: ../../include/widgets.php:1328 ../../mod/photos.php:748
+#: ../../include/widgets.php:1360 ../../mod/photos.php:748
 #: ../../mod/photos.php:1283
 msgid "View Photo"
 msgstr "Ver foto"
 
-#: ../../include/widgets.php:1345 ../../mod/photos.php:779
+#: ../../include/widgets.php:1377 ../../mod/photos.php:779
 msgid "Edit Album"
 msgstr "Editar álbum"
 
-#: ../../include/zot.php:676
-msgid "Invalid data packet"
-msgstr "Paquete de datos no válido"
-
-#: ../../include/zot.php:692
-msgid "Unable to verify channel signature"
-msgstr "No ha sido posible de verificar la firma del canal"
-
-#: ../../include/zot.php:2268
-#, php-format
-msgid "Unable to verify site signature for %s"
-msgstr "No ha sido posible de verificar la firma del sitio para %s"
-
-#: ../../include/zot.php:3584
-msgid "invalid target signature"
-msgstr "La firma recibida no es válida"
-
 #: ../../index.php:238 ../../mod/help.php:213
 msgid "Not Found"
 msgstr "No encontrado"
@@ -4359,9 +4368,9 @@ msgid "Message queues"
 msgstr "Mensajes en cola"
 
 #: ../../mod/admin.php:206 ../../mod/admin.php:451 ../../mod/admin.php:619
-#: ../../mod/admin.php:886 ../../mod/admin.php:1050 ../../mod/admin.php:1147
-#: ../../mod/admin.php:1187 ../../mod/admin.php:1347 ../../mod/admin.php:1381
-#: ../../mod/admin.php:1466
+#: ../../mod/admin.php:886 ../../mod/admin.php:1050 ../../mod/admin.php:1165
+#: ../../mod/admin.php:1226 ../../mod/admin.php:1387 ../../mod/admin.php:1421
+#: ../../mod/admin.php:1506
 msgid "Administration"
 msgstr "Administración"
 
@@ -4425,7 +4434,7 @@ msgstr "Mi sitio es un servicio gratuito"
 msgid "My site offers free accounts with optional paid upgrades"
 msgstr "Mi sitio ofrece cuentas gratuitas con opciones extra de pago"
 
-#: ../../mod/admin.php:454 ../../mod/register.php:209
+#: ../../mod/admin.php:454 ../../mod/register.php:237
 msgid "Registration"
 msgstr "Registro"
 
@@ -4737,7 +4746,7 @@ msgstr "por canal"
 msgid "on server"
 msgstr "en el servidor"
 
-#: ../../mod/admin.php:618
+#: ../../mod/admin.php:618 ../../mod/connections.php:267
 msgid "Status"
 msgstr "Estado"
 
@@ -4866,7 +4875,7 @@ msgstr "Fecha de solicitud"
 msgid "No registrations."
 msgstr "Sin registros."
 
-#: ../../mod/admin.php:893 ../../mod/connedit.php:716
+#: ../../mod/admin.php:893 ../../mod/connedit.php:719
 msgid "Approve"
 msgstr "Aprobar"
 
@@ -4874,11 +4883,11 @@ msgstr "Aprobar"
 msgid "Deny"
 msgstr "Rechazar"
 
-#: ../../mod/admin.php:896 ../../mod/connedit.php:525
+#: ../../mod/admin.php:896 ../../mod/connedit.php:528
 msgid "Block"
 msgstr "Bloquear"
 
-#: ../../mod/admin.php:897 ../../mod/connedit.php:525
+#: ../../mod/admin.php:897 ../../mod/connedit.php:528
 msgid "Unblock"
 msgstr "Desbloquear"
 
@@ -4996,114 +5005,130 @@ msgid ""
 "channel on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "El canal {0} va a ser eliminado!\\n\\nTodo lo publicado por el canal en este sitio se borrará definitivamente!\\n\\n¿Está seguro de querer hacerlo?"
 
-#: ../../mod/admin.php:1103
+#: ../../mod/admin.php:1120
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "Extensión %s desactivada."
 
-#: ../../mod/admin.php:1107
+#: ../../mod/admin.php:1124
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "Extensión %s activada."
 
-#: ../../mod/admin.php:1117 ../../mod/admin.php:1320
+#: ../../mod/admin.php:1134 ../../mod/admin.php:1360
 msgid "Disable"
 msgstr "Desactivar"
 
-#: ../../mod/admin.php:1120 ../../mod/admin.php:1322
+#: ../../mod/admin.php:1137 ../../mod/admin.php:1362
 msgid "Enable"
 msgstr "Activar"
 
-#: ../../mod/admin.php:1149 ../../mod/admin.php:1349
+#: ../../mod/admin.php:1167 ../../mod/admin.php:1389
 msgid "Toggle"
 msgstr "Cambiar"
 
-#: ../../mod/admin.php:1157 ../../mod/admin.php:1359
+#: ../../mod/admin.php:1175 ../../mod/admin.php:1399
 msgid "Author: "
 msgstr "Autor:"
 
-#: ../../mod/admin.php:1158 ../../mod/admin.php:1360
+#: ../../mod/admin.php:1176 ../../mod/admin.php:1400
 msgid "Maintainer: "
 msgstr "Mantenedor:"
 
-#: ../../mod/admin.php:1285
+#: ../../mod/admin.php:1177
+msgid "Minimum project version: "
+msgstr "Versión mínima del proyecto:"
+
+#: ../../mod/admin.php:1178
+msgid "Maximum project version: "
+msgstr "Versión máxima del proyecto:"
+
+#: ../../mod/admin.php:1179
+msgid "Minimum PHP version: "
+msgstr "Versión mínima de PHP:"
+
+#: ../../mod/admin.php:1181 ../../mod/admin.php:1232
+msgid "Disabled - version incompatibility"
+msgstr "Deshabilitado - versiones incompatibles"
+
+#: ../../mod/admin.php:1325
 msgid "No themes found."
 msgstr "No se han encontrado temas."
 
-#: ../../mod/admin.php:1341
+#: ../../mod/admin.php:1381
 msgid "Screenshot"
 msgstr "Instantánea de pantalla"
 
-#: ../../mod/admin.php:1387
+#: ../../mod/admin.php:1427
 msgid "[Experimental]"
 msgstr "[Experimental]"
 
-#: ../../mod/admin.php:1388
+#: ../../mod/admin.php:1428
 msgid "[Unsupported]"
 msgstr "[No soportado]"
 
-#: ../../mod/admin.php:1412
+#: ../../mod/admin.php:1452
 msgid "Log settings updated."
 msgstr "Actualizado el informe de configuraciones."
 
-#: ../../mod/admin.php:1469
+#: ../../mod/admin.php:1509
 msgid "Clear"
 msgstr "Vaciar"
 
-#: ../../mod/admin.php:1475
+#: ../../mod/admin.php:1515
 msgid "Debugging"
 msgstr "Depuración"
 
-#: ../../mod/admin.php:1476
+#: ../../mod/admin.php:1516
 msgid "Log file"
 msgstr "Fichero de informe"
 
-#: ../../mod/admin.php:1476
+#: ../../mod/admin.php:1516
 msgid ""
 "Must be writable by web server. Relative to your Red top-level directory."
 msgstr "Debe tener permisos de escritura por el servidor web. La ruta es relativa al directorio de instalación de Hubzilla."
 
-#: ../../mod/admin.php:1477
+#: ../../mod/admin.php:1517
 msgid "Log level"
 msgstr "Nivel de depuración"
 
-#: ../../mod/admin.php:1523
+#: ../../mod/admin.php:1563
 msgid "New Profile Field"
 msgstr "Nuevo campo en el perfil"
 
-#: ../../mod/admin.php:1524 ../../mod/admin.php:1544
+#: ../../mod/admin.php:1564 ../../mod/admin.php:1584
 msgid "Field nickname"
 msgstr "Alias del campo"
 
-#: ../../mod/admin.php:1524 ../../mod/admin.php:1544
+#: ../../mod/admin.php:1564 ../../mod/admin.php:1584
 msgid "System name of field"
 msgstr "Nombre del campo en el sistema"
 
-#: ../../mod/admin.php:1525 ../../mod/admin.php:1545
+#: ../../mod/admin.php:1565 ../../mod/admin.php:1585
 msgid "Input type"
 msgstr "Tipo de entrada"
 
-#: ../../mod/admin.php:1526 ../../mod/admin.php:1546
+#: ../../mod/admin.php:1566 ../../mod/admin.php:1586
 msgid "Field Name"
 msgstr "Nombre del campo"
 
-#: ../../mod/admin.php:1526 ../../mod/admin.php:1546
+#: ../../mod/admin.php:1566 ../../mod/admin.php:1586
 msgid "Label on profile pages"
 msgstr "Etiqueta a mostrar en la página del perfil"
 
-#: ../../mod/admin.php:1527 ../../mod/admin.php:1547
+#: ../../mod/admin.php:1567 ../../mod/admin.php:1587
 msgid "Help text"
 msgstr "Texto de ayuda"
 
-#: ../../mod/admin.php:1527 ../../mod/admin.php:1547
+#: ../../mod/admin.php:1567 ../../mod/admin.php:1587
 msgid "Additional info (optional)"
 msgstr "Información adicional (opcional)"
 
-#: ../../mod/admin.php:1537
+#: ../../mod/admin.php:1577
 msgid "Field definition not found"
 msgstr "Definición del campo no encontrada"
 
-#: ../../mod/admin.php:1543
+#: ../../mod/admin.php:1583
 msgid "Edit Profile Field"
 msgstr "Modificar el campo del perfil"
 
@@ -5325,340 +5350,86 @@ msgstr "(No ha sido proporcionada ninguna instrucción específica por el propie
 msgid "Restricted or Premium Channel"
 msgstr "Canal premium o restringido"
 
-#: ../../mod/connections.php:52 ../../mod/connections.php:150
+#: ../../mod/connections.php:52 ../../mod/connections.php:157
+#: ../../mod/connections.php:238
 msgid "Blocked"
 msgstr "Bloqueadas"
 
-#: ../../mod/connections.php:57 ../../mod/connections.php:157
+#: ../../mod/connections.php:57 ../../mod/connections.php:164
+#: ../../mod/connections.php:237
 msgid "Ignored"
 msgstr "Ignoradas"
 
-#: ../../mod/connections.php:62 ../../mod/connections.php:171
+#: ../../mod/connections.php:62 ../../mod/connections.php:178
+#: ../../mod/connections.php:236
 msgid "Hidden"
 msgstr "Ocultas"
 
-#: ../../mod/connections.php:67 ../../mod/connections.php:164
+#: ../../mod/connections.php:67 ../../mod/connections.php:171
+#: ../../mod/connections.php:235
 msgid "Archived"
 msgstr "Archivadas"
 
-#: ../../mod/connections.php:128
-msgid "Suggest new connections"
-msgstr "Sugerir nuevas conexiones"
-
-#: ../../mod/connections.php:131
+#: ../../mod/connections.php:134
 msgid "New Connections"
 msgstr "Nuevas conexiones"
 
-#: ../../mod/connections.php:134
+#: ../../mod/connections.php:137
 msgid "Show pending (new) connections"
 msgstr "Mostrar conexiones (nuevas) pendientes"
 
-#: ../../mod/connections.php:137 ../../mod/profperm.php:139
+#: ../../mod/connections.php:141 ../../mod/profperm.php:139
 msgid "All Connections"
 msgstr "Todas las conexiones"
 
-#: ../../mod/connections.php:140
+#: ../../mod/connections.php:144
 msgid "Show all connections"
 msgstr "Mostrar todas las conexiones"
 
-#: ../../mod/connections.php:143
-msgid "Unblocked"
-msgstr "Desbloqueadas"
-
-#: ../../mod/connections.php:146
-msgid "Only show unblocked connections"
-msgstr "Mostrar solo las conexiones desbloqueadas"
-
-#: ../../mod/connections.php:153
+#: ../../mod/connections.php:160
 msgid "Only show blocked connections"
 msgstr "Mostrar solo las conexiones bloqueadas"
 
-#: ../../mod/connections.php:160
+#: ../../mod/connections.php:167
 msgid "Only show ignored connections"
 msgstr "Mostrar solo conexiones ignoradas"
 
-#: ../../mod/connections.php:167
+#: ../../mod/connections.php:174
 msgid "Only show archived connections"
 msgstr "Mostrar solo las conexiones archivadas"
 
-#: ../../mod/connections.php:174
+#: ../../mod/connections.php:181
 msgid "Only show hidden connections"
 msgstr "Mostrar solo las conexiones ocultas"
 
-#: ../../mod/connections.php:225
+#: ../../mod/connections.php:234
+msgid "Pending"
+msgstr "Pendiente"
+
+#: ../../mod/connections.php:250
 #, php-format
 msgid "%1$s [%2$s]"
 msgstr "%1$s [%2$s]"
 
-#: ../../mod/connections.php:226
+#: ../../mod/connections.php:251
 msgid "Edit connection"
 msgstr "Editar conexión"
 
-#: ../../mod/connections.php:264
-msgid "Search your connections"
-msgstr "Buscar sus conexiones"
-
-#: ../../mod/connections.php:265
-msgid "Finding: "
-msgstr "Búsqueda:"
-
-#: ../../mod/connedit.php:75
-msgid "Could not access contact record."
-msgstr "No se ha podido acceder al registro de contacto."
-
-#: ../../mod/connedit.php:99
-msgid "Could not locate selected profile."
-msgstr "No se ha podido localizar el perfil seleccionado."
-
-#: ../../mod/connedit.php:223
-msgid "Connection updated."
-msgstr "Conexión actualizada."
-
-#: ../../mod/connedit.php:225
-msgid "Failed to update connection record."
-msgstr "Error al actualizar el registro de la conexión."
-
-#: ../../mod/connedit.php:272
-msgid "is now connected to"
-msgstr "ahora está conectado/a"
-
-#: ../../mod/connedit.php:395
-msgid "Could not access address book record."
-msgstr "No se pudo acceder al registro en su libreta de direcciones."
-
-#: ../../mod/connedit.php:409
-msgid "Refresh failed - channel is currently unavailable."
-msgstr "Recarga fallida - no se puede encontrar el canal en este momento."
-
-#: ../../mod/connedit.php:424 ../../mod/connedit.php:433
-#: ../../mod/connedit.php:442 ../../mod/connedit.php:451
-#: ../../mod/connedit.php:464
-msgid "Unable to set address book parameters."
-msgstr "No ha sido posible establecer los parámetros de la libreta de direcciones."
-
-#: ../../mod/connedit.php:488
-msgid "Connection has been removed."
-msgstr "La conexión ha sido eliminada."
-
-#: ../../mod/connedit.php:507
-#, php-format
-msgid "View %s's profile"
-msgstr "Ver el perfil de %s"
-
-#: ../../mod/connedit.php:511
-msgid "Refresh Permissions"
-msgstr "Recargar los permisos"
-
-#: ../../mod/connedit.php:514
-msgid "Fetch updated permissions"
-msgstr "Obtener los permisos actualizados"
-
-#: ../../mod/connedit.php:518
-msgid "Recent Activity"
-msgstr "Actividad reciente"
-
-#: ../../mod/connedit.php:521
-msgid "View recent posts and comments"
-msgstr "Ver publicaciones y comentarios recientes"
-
-#: ../../mod/connedit.php:528
-msgid "Block (or Unblock) all communications with this connection"
-msgstr "Bloquear (o desbloquear) todas las comunicaciones con esta conexión"
-
-#: ../../mod/connedit.php:529
-msgid "This connection is blocked!"
-msgstr "¡Esta conexión está bloqueada!"
-
-#: ../../mod/connedit.php:533
-msgid "Unignore"
-msgstr "Dejar de ignorar"
-
-#: ../../mod/connedit.php:533 ../../mod/notifications.php:51
-msgid "Ignore"
-msgstr "Ignorar"
-
-#: ../../mod/connedit.php:536
-msgid "Ignore (or Unignore) all inbound communications from this connection"
-msgstr "Ignorar (o dejar de ignorar) todas las comunicaciones entrantes de esta conexión"
-
-#: ../../mod/connedit.php:537
-msgid "This connection is ignored!"
-msgstr "¡Esta conexión es ignorada!"
-
-#: ../../mod/connedit.php:541
-msgid "Unarchive"
-msgstr "Desarchivar"
-
-#: ../../mod/connedit.php:541
-msgid "Archive"
-msgstr "Archivar"
-
-#: ../../mod/connedit.php:544
-msgid ""
-"Archive (or Unarchive) this connection - mark channel dead but keep content"
-msgstr "Archiva (o desarchiva) esta conexión - marca el canal como muerto aunque mantiene sus contenidos"
-
-#: ../../mod/connedit.php:545
-msgid "This connection is archived!"
-msgstr "¡Esta conexión esta archivada!"
-
-#: ../../mod/connedit.php:549
-msgid "Unhide"
-msgstr "Mostrar"
-
-#: ../../mod/connedit.php:549
-msgid "Hide"
-msgstr "Ocultar"
-
-#: ../../mod/connedit.php:552
-msgid "Hide or Unhide this connection from your other connections"
-msgstr "Ocultar o mostrar esta conexión a sus otras conexiones"
-
-#: ../../mod/connedit.php:553
-msgid "This connection is hidden!"
-msgstr "¡Esta conexión está oculta!"
-
-#: ../../mod/connedit.php:560
-msgid "Delete this connection"
-msgstr "Eliminar esta conexión"
-
-#: ../../mod/connedit.php:641
-msgid "Approve this connection"
-msgstr "Aprobar esta conexión"
-
-#: ../../mod/connedit.php:641
-msgid "Accept connection to allow communication"
-msgstr "Aceptar la conexión para permitir la comunicación"
-
-#: ../../mod/connedit.php:646
-msgid "Set Affinity"
-msgstr "Ajustar la afinidad"
-
-#: ../../mod/connedit.php:649
-msgid "Set Profile"
-msgstr "Ajustar el perfil"
-
-#: ../../mod/connedit.php:652
-msgid "Set Affinity & Profile"
-msgstr "Ajustar la afinidad y el perfil"
-
-#: ../../mod/connedit.php:685
-msgid "none"
-msgstr "-"
-
-#: ../../mod/connedit.php:690
-msgid "Apply these permissions automatically"
-msgstr "Aplicar estos permisos automaticamente"
-
-#: ../../mod/connedit.php:692
-msgid "This connection's primary address is"
-msgstr "La dirección primaria de esta conexión es"
-
-#: ../../mod/connedit.php:693
-msgid "Available locations:"
-msgstr "Ubicaciones disponibles:"
-
-#: ../../mod/connedit.php:697
-msgid ""
-"The permissions indicated on this page will be applied to all new "
-"connections."
-msgstr "Los permisos indicados en esta página serán aplicados en todas las nuevas conexiones."
-
-#: ../../mod/connedit.php:699
-msgid "Slide to adjust your degree of friendship"
-msgstr "Deslizar para ajustar el grado de amistad"
-
-#: ../../mod/connedit.php:701
-msgid "Slide to adjust your rating"
-msgstr "Deslizar para ajustar su valoración"
-
-#: ../../mod/connedit.php:702 ../../mod/connedit.php:707
-msgid "Optionally explain your rating"
-msgstr "Opcionalmente, puede explicar su valoración"
-
-#: ../../mod/connedit.php:704
-msgid "Custom Filter"
-msgstr "Filtro personalizado"
-
-#: ../../mod/connedit.php:705
-msgid "Only import posts with this text"
-msgstr "Importar solo entradas que contengan este texto"
-
-#: ../../mod/connedit.php:705 ../../mod/connedit.php:706
-msgid ""
-"words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
-"all posts"
-msgstr "Una sola opción por línea: palabras, #etiquetas,  /patrones/ o lang=xx. Dejar en blanco para importarlo todo"
-
-#: ../../mod/connedit.php:706
-msgid "Do not import posts with this text"
-msgstr "No importar entradas que contengan este texto"
-
-#: ../../mod/connedit.php:708
-msgid "This information is public!"
-msgstr "¡Esta información es pública!"
-
-#: ../../mod/connedit.php:713
-msgid "Connection Pending Approval"
-msgstr "Conexión pendiente de aprobación"
-
-#: ../../mod/connedit.php:714
-msgid "Connection Request"
-msgstr "Solicitud de conexión"
-
-#: ../../mod/connedit.php:715
-#, php-format
-msgid ""
-"(%s) would like to connect with you. Please approve this connection to allow"
-" communication."
-msgstr "(%s) desearía conectar con usted. por favor, apruebe esta conexión para permitir la comunicación."
-
-#: ../../mod/connedit.php:717
-msgid "Approve Later"
-msgstr "Aprobar más tarde"
-
-#: ../../mod/connedit.php:720
-msgid "inherited"
-msgstr "heredado"
-
-#: ../../mod/connedit.php:722
-#, php-format
-msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
-msgstr "Por favor, escoja el perfil que quiere mostrar a %s cuando esté viendo su perfil de forma segura."
-
-#: ../../mod/connedit.php:724
-msgid "Their Settings"
-msgstr "Sus ajustes"
-
-#: ../../mod/connedit.php:725
-msgid "My Settings"
-msgstr "Mis ajustes"
-
-#: ../../mod/connedit.php:727
-msgid "Individual Permissions"
-msgstr "Permisos individuales"
+#: ../../mod/connections.php:252
+msgid "Delete connection"
+msgstr "Eliminar conexión"
 
-#: ../../mod/connedit.php:728
-msgid ""
-"Some permissions may be inherited from your channel's <a "
-"href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
-"priority than individual settings. You can <strong>not</strong> change those"
-" settings here."
-msgstr "Algunos permisos pueden ser heredados de los <a href=\"settings\"><strong>ajustes de privacidad</strong></a> de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. <strong>No</strong> puede cambiar estos ajustes aquí."
+#: ../../mod/connections.php:269
+msgid "Connected"
+msgstr "Conectado/a"
 
-#: ../../mod/connedit.php:729
-msgid ""
-"Some permissions may be inherited from your channel's <a "
-"href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
-"priority than individual settings. You can change those settings here but "
-"they wont have any impact unless the inherited setting changes."
-msgstr "Algunos permisos pueden ser heredados de los <a href=\"settings\"><strong>ajustes de privacidad</strong></a> de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. Puede cambiar estos ajustes aquí, pero no tendrán ningún consecuencia hasta que cambie los ajustes heredados."
+#: ../../mod/connections.php:298
+msgid "Search your connections"
+msgstr "Buscar sus conexiones"
 
-#: ../../mod/connedit.php:730
-msgid "Last update:"
-msgstr "Última actualización:"
+#: ../../mod/connections.php:299
+msgid "Connections search"
+msgstr "Buscar conexiones"
 
 #: ../../mod/dav.php:121
 msgid "$Projectname channel"
@@ -7060,8 +6831,8 @@ msgid ""
 "service provider allows."
 msgstr "Un canal está formado por su propia colección de páginas web relacionadas. Se puede utilizar para almacenar los perfiles sociales de la red, blogs, grupos de conversación y foros, páginas de famosos y mucho más. Puede crear tantos canales como su proveedor de servicio permita."
 
-#: ../../mod/new_channel.php:123 ../../mod/sources.php:103
-#: ../../mod/sources.php:137
+#: ../../mod/new_channel.php:123 ../../mod/register.php:246
+#: ../../mod/sources.php:103 ../../mod/sources.php:137
 msgid "Channel Name"
 msgstr "Nombre del canal"
 
@@ -7069,11 +6840,11 @@ msgstr "Nombre del canal"
 msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "
 msgstr "Ejemplos: \"Juan García\", \"Isabel y sus caballos\", \"Fútbol\", \"Grupo de parapente\" "
 
-#: ../../mod/new_channel.php:125
+#: ../../mod/new_channel.php:125 ../../mod/register.php:248
 msgid "Choose a short nickname"
 msgstr "Elija un alias corto"
 
-#: ../../mod/new_channel.php:126
+#: ../../mod/new_channel.php:126 ../../mod/register.php:249
 msgid ""
 "Your nickname will be used to create an easily remembered channel address "
 "(like an email address) which you can share with others."
@@ -7083,17 +6854,17 @@ msgstr "Su alias podrá usarse para crear una dirección de canal fácilmente me
 msgid "Or <a href=\"import\">import an existing channel</a> from another location"
 msgstr "O <a href=\"import\">importar un canal existente</a> de otro lugar"
 
-#: ../../mod/new_channel.php:129
+#: ../../mod/new_channel.php:129 ../../mod/register.php:251
 msgid ""
 "Please choose a channel type (such as social networking or community forum) "
 "and privacy requirements so we can select the best permissions for you"
 msgstr "Elija el tipo de canal (como red social o foro de discusión) y la privacidad que requiera, así podremos seleccionar el mejor conjunto de permisos para usted"
 
-#: ../../mod/new_channel.php:130
+#: ../../mod/new_channel.php:130 ../../mod/register.php:252
 msgid "Channel Type"
 msgstr "Tipo de canal"
 
-#: ../../mod/new_channel.php:130
+#: ../../mod/new_channel.php:130 ../../mod/register.php:252
 msgid "Read more about roles"
 msgstr "Leer más sobre los roles"
 
@@ -7105,6 +6876,10 @@ msgstr "Petición inválida del identificador."
 msgid "Discard"
 msgstr "Descartar"
 
+#: ../../mod/notifications.php:51 ../../mod/connedit.php:536
+msgid "Ignore"
+msgstr "Ignorar"
+
 #: ../../mod/notifications.php:94 ../../mod/notify.php:53
 msgid "No more system notifications."
 msgstr "No hay más notificaciones del sistema"
@@ -7359,11 +7134,11 @@ msgstr "Convertir en privado este envío"
 msgid "Fetching URL returns error: %1$s"
 msgstr "Al intentar obtener la dirección, retorna el error: %1$s"
 
-#: ../../mod/profile_photo.php:112
+#: ../../mod/profile_photo.php:112 ../../mod/cover_photo.php:54
 msgid "Image uploaded but image cropping failed."
 msgstr "Imagen actualizada, pero el recorte de la imagen ha fallado. "
 
-#: ../../mod/profile_photo.php:166
+#: ../../mod/profile_photo.php:166 ../../mod/cover_photo.php:150
 msgid "Image resize failed."
 msgstr "El ajuste del tamaño de la imagen ha fallado."
 
@@ -7373,33 +7148,33 @@ msgid ""
 "display immediately."
 msgstr "Recargue la página o limpie el caché del navegador si la nueva foto no se muestra inmediatamente."
 
-#: ../../mod/profile_photo.php:250
+#: ../../mod/profile_photo.php:250 ../../mod/cover_photo.php:188
 msgid "Image upload failed."
 msgstr "Subida de imagen fallida."
 
-#: ../../mod/profile_photo.php:269
+#: ../../mod/profile_photo.php:269 ../../mod/cover_photo.php:206
 msgid "Unable to process image."
 msgstr "No ha sido posible procesar la imagen."
 
-#: ../../mod/profile_photo.php:297
+#: ../../mod/profile_photo.php:297 ../../mod/cover_photo.php:229
 msgid "female"
 msgstr "mujer"
 
-#: ../../mod/profile_photo.php:298
+#: ../../mod/profile_photo.php:298 ../../mod/cover_photo.php:230
 #, php-format
 msgid "%1$s updated her %2$s"
 msgstr "%1$s ha actualizado su %2$s"
 
-#: ../../mod/profile_photo.php:299
+#: ../../mod/profile_photo.php:299 ../../mod/cover_photo.php:231
 msgid "male"
 msgstr "hombre"
 
-#: ../../mod/profile_photo.php:300
+#: ../../mod/profile_photo.php:300 ../../mod/cover_photo.php:232
 #, php-format
 msgid "%1$s updated his %2$s"
 msgstr "%1$s ha actualizado su %2$s"
 
-#: ../../mod/profile_photo.php:302
+#: ../../mod/profile_photo.php:302 ../../mod/cover_photo.php:234
 #, php-format
 msgid "%1$s updated their %2$s"
 msgstr "%1$s ha actualizado su %2$s"
@@ -7409,14 +7184,15 @@ msgid "profile photo"
 msgstr "foto del perfil"
 
 #: ../../mod/profile_photo.php:368 ../../mod/profile_photo.php:409
+#: ../../mod/cover_photo.php:299 ../../mod/cover_photo.php:314
 msgid "Photo not available."
 msgstr "Foto no disponible."
 
-#: ../../mod/profile_photo.php:450
+#: ../../mod/profile_photo.php:450 ../../mod/cover_photo.php:350
 msgid "Upload File:"
 msgstr "Subir fichero:"
 
-#: ../../mod/profile_photo.php:451
+#: ../../mod/profile_photo.php:451 ../../mod/cover_photo.php:351
 msgid "Select a profile:"
 msgstr "Seleccionar un perfil:"
 
@@ -7425,26 +7201,27 @@ msgid "Upload Profile Photo"
 msgstr "Subir foto del perfil"
 
 #: ../../mod/profile_photo.php:457 ../../mod/settings.php:975
+#: ../../mod/cover_photo.php:357
 msgid "or"
 msgstr "o"
 
-#: ../../mod/profile_photo.php:457
+#: ../../mod/profile_photo.php:457 ../../mod/cover_photo.php:357
 msgid "skip this step"
 msgstr "Omitir este paso"
 
-#: ../../mod/profile_photo.php:457
+#: ../../mod/profile_photo.php:457 ../../mod/cover_photo.php:357
 msgid "select a photo from your photo albums"
 msgstr "Seleccione una foto de sus álbumes de fotos"
 
-#: ../../mod/profile_photo.php:473
+#: ../../mod/profile_photo.php:473 ../../mod/cover_photo.php:373
 msgid "Crop Image"
 msgstr "Recortar imagen"
 
-#: ../../mod/profile_photo.php:474
+#: ../../mod/profile_photo.php:474 ../../mod/cover_photo.php:374
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr "Por favor ajuste el recorte de la imagen para una visión óptima."
 
-#: ../../mod/profile_photo.php:476
+#: ../../mod/profile_photo.php:476 ../../mod/cover_photo.php:376
 msgid "Done Editing"
 msgstr "Edición completada"
 
@@ -7811,78 +7588,86 @@ msgstr "Dirección del marcador"
 msgid "Or enter new bookmark folder name"
 msgstr "O introduzca un nuevo nombre para la carpeta de marcadores"
 
-#: ../../mod/register.php:44
+#: ../../mod/register.php:45
 msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
 msgstr "Se ha superado el límite máximo de inscripciones diarias de este sitio. Por favor, pruebe de nuevo mañana."
 
-#: ../../mod/register.php:50
+#: ../../mod/register.php:51
 msgid ""
 "Please indicate acceptance of the Terms of Service. Registration failed."
 msgstr "Por favor, confirme que acepta los Términos del servicio. El registro ha fallado."
 
-#: ../../mod/register.php:84
+#: ../../mod/register.php:85
 msgid "Passwords do not match."
 msgstr "Las contraseñas no coinciden."
 
-#: ../../mod/register.php:119
+#: ../../mod/register.php:127
 msgid ""
 "Registration successful. Please check your email for validation "
 "instructions."
 msgstr "Registro realizado con éxito. Por favor, compruebe su correo electrónico para ver las instrucciones para validarlo."
 
-#: ../../mod/register.php:125
+#: ../../mod/register.php:133
 msgid "Your registration is pending approval by the site owner."
 msgstr "Su registro está pendiente de aprobación por el propietario del sitio."
 
-#: ../../mod/register.php:128
+#: ../../mod/register.php:136
 msgid "Your registration can not be processed."
 msgstr "Su registro no puede ser procesado."
 
-#: ../../mod/register.php:165
+#: ../../mod/register.php:179
+msgid "Registration on this site is disabled."
+msgstr "El registro está deshabilitado en este sitio."
+
+#: ../../mod/register.php:188
 msgid "Registration on this site/hub is by approval only."
 msgstr "El registro en este servidor/hub está sometido a aprobación previa."
 
-#: ../../mod/register.php:166
+#: ../../mod/register.php:189
 msgid "<a href=\"pubsites\">Register at another affiliated site/hub</a>"
 msgstr "<a href=\"pubsites\">Inscribirse en un servidor/hub afiliado</a>"
 
-#: ../../mod/register.php:176
+#: ../../mod/register.php:199
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
 msgstr "Este sitio ha excedido el límite de inscripción diaria de cuentas. Por favor, inténtelo de nuevo mañana."
 
-#: ../../mod/register.php:187
+#: ../../mod/register.php:210
 msgid "Terms of Service"
 msgstr "Términos del servicio"
 
-#: ../../mod/register.php:193
+#: ../../mod/register.php:216
 #, php-format
 msgid "I accept the %s for this website"
 msgstr "Acepto los %s de este sitio"
 
-#: ../../mod/register.php:195
+#: ../../mod/register.php:218
 #, php-format
 msgid "I am over 13 years of age and accept the %s for this website"
 msgstr "Tengo más de 13 años de edad y acepto los %s de este sitio"
 
-#: ../../mod/register.php:214
+#: ../../mod/register.php:242
 msgid "Membership on this site is by invitation only."
 msgstr "Para registrarse en este sitio es necesaria una invitación."
 
-#: ../../mod/register.php:215
+#: ../../mod/register.php:243
 msgid "Please enter your invitation code"
 msgstr "Por favor, introduzca el código de su invitación"
 
-#: ../../mod/register.php:218
+#: ../../mod/register.php:247
+msgid "Enter your name"
+msgstr "Su nombre"
+
+#: ../../mod/register.php:256
 msgid "Your email address"
 msgstr "Su dirección de correo electrónico"
 
-#: ../../mod/register.php:219
+#: ../../mod/register.php:257
 msgid "Choose a password"
 msgstr "Elija una contraseña"
 
-#: ../../mod/register.php:220
+#: ../../mod/register.php:258
 msgid "Please re-enter your password"
 msgstr "Por favor, vuelva a escribir su contraseña"
 
@@ -8972,6 +8757,260 @@ msgid ""
 "poller."
 msgstr "IMPORTANTE: Debe crear [manualmente] una tarea programada para el \"poller\"."
 
+#: ../../mod/connedit.php:75
+msgid "Could not access contact record."
+msgstr "No se ha podido acceder al registro de contacto."
+
+#: ../../mod/connedit.php:99
+msgid "Could not locate selected profile."
+msgstr "No se ha podido localizar el perfil seleccionado."
+
+#: ../../mod/connedit.php:223
+msgid "Connection updated."
+msgstr "Conexión actualizada."
+
+#: ../../mod/connedit.php:225
+msgid "Failed to update connection record."
+msgstr "Error al actualizar el registro de la conexión."
+
+#: ../../mod/connedit.php:272
+msgid "is now connected to"
+msgstr "ahora está conectado/a"
+
+#: ../../mod/connedit.php:398
+msgid "Could not access address book record."
+msgstr "No se pudo acceder al registro en su libreta de direcciones."
+
+#: ../../mod/connedit.php:412
+msgid "Refresh failed - channel is currently unavailable."
+msgstr "Recarga fallida - no se puede encontrar el canal en este momento."
+
+#: ../../mod/connedit.php:427 ../../mod/connedit.php:436
+#: ../../mod/connedit.php:445 ../../mod/connedit.php:454
+#: ../../mod/connedit.php:467
+msgid "Unable to set address book parameters."
+msgstr "No ha sido posible establecer los parámetros de la libreta de direcciones."
+
+#: ../../mod/connedit.php:491
+msgid "Connection has been removed."
+msgstr "La conexión ha sido eliminada."
+
+#: ../../mod/connedit.php:510
+#, php-format
+msgid "View %s's profile"
+msgstr "Ver el perfil de %s"
+
+#: ../../mod/connedit.php:514
+msgid "Refresh Permissions"
+msgstr "Recargar los permisos"
+
+#: ../../mod/connedit.php:517
+msgid "Fetch updated permissions"
+msgstr "Obtener los permisos actualizados"
+
+#: ../../mod/connedit.php:521
+msgid "Recent Activity"
+msgstr "Actividad reciente"
+
+#: ../../mod/connedit.php:524
+msgid "View recent posts and comments"
+msgstr "Ver publicaciones y comentarios recientes"
+
+#: ../../mod/connedit.php:531
+msgid "Block (or Unblock) all communications with this connection"
+msgstr "Bloquear (o desbloquear) todas las comunicaciones con esta conexión"
+
+#: ../../mod/connedit.php:532
+msgid "This connection is blocked!"
+msgstr "¡Esta conexión está bloqueada!"
+
+#: ../../mod/connedit.php:536
+msgid "Unignore"
+msgstr "Dejar de ignorar"
+
+#: ../../mod/connedit.php:539
+msgid "Ignore (or Unignore) all inbound communications from this connection"
+msgstr "Ignorar (o dejar de ignorar) todas las comunicaciones entrantes de esta conexión"
+
+#: ../../mod/connedit.php:540
+msgid "This connection is ignored!"
+msgstr "¡Esta conexión es ignorada!"
+
+#: ../../mod/connedit.php:544
+msgid "Unarchive"
+msgstr "Desarchivar"
+
+#: ../../mod/connedit.php:544
+msgid "Archive"
+msgstr "Archivar"
+
+#: ../../mod/connedit.php:547
+msgid ""
+"Archive (or Unarchive) this connection - mark channel dead but keep content"
+msgstr "Archiva (o desarchiva) esta conexión - marca el canal como muerto aunque mantiene sus contenidos"
+
+#: ../../mod/connedit.php:548
+msgid "This connection is archived!"
+msgstr "¡Esta conexión esta archivada!"
+
+#: ../../mod/connedit.php:552
+msgid "Unhide"
+msgstr "Mostrar"
+
+#: ../../mod/connedit.php:552
+msgid "Hide"
+msgstr "Ocultar"
+
+#: ../../mod/connedit.php:555
+msgid "Hide or Unhide this connection from your other connections"
+msgstr "Ocultar o mostrar esta conexión a sus otras conexiones"
+
+#: ../../mod/connedit.php:556
+msgid "This connection is hidden!"
+msgstr "¡Esta conexión está oculta!"
+
+#: ../../mod/connedit.php:563
+msgid "Delete this connection"
+msgstr "Eliminar esta conexión"
+
+#: ../../mod/connedit.php:644
+msgid "Approve this connection"
+msgstr "Aprobar esta conexión"
+
+#: ../../mod/connedit.php:644
+msgid "Accept connection to allow communication"
+msgstr "Aceptar la conexión para permitir la comunicación"
+
+#: ../../mod/connedit.php:649
+msgid "Set Affinity"
+msgstr "Ajustar la afinidad"
+
+#: ../../mod/connedit.php:652
+msgid "Set Profile"
+msgstr "Ajustar el perfil"
+
+#: ../../mod/connedit.php:655
+msgid "Set Affinity & Profile"
+msgstr "Ajustar la afinidad y el perfil"
+
+#: ../../mod/connedit.php:688
+msgid "none"
+msgstr "-"
+
+#: ../../mod/connedit.php:693
+msgid "Apply these permissions automatically"
+msgstr "Aplicar estos permisos automaticamente"
+
+#: ../../mod/connedit.php:695
+msgid "This connection's primary address is"
+msgstr "La dirección primaria de esta conexión es"
+
+#: ../../mod/connedit.php:696
+msgid "Available locations:"
+msgstr "Ubicaciones disponibles:"
+
+#: ../../mod/connedit.php:700
+msgid ""
+"The permissions indicated on this page will be applied to all new "
+"connections."
+msgstr "Los permisos indicados en esta página serán aplicados en todas las nuevas conexiones."
+
+#: ../../mod/connedit.php:702
+msgid "Slide to adjust your degree of friendship"
+msgstr "Deslizar para ajustar el grado de amistad"
+
+#: ../../mod/connedit.php:704
+msgid "Slide to adjust your rating"
+msgstr "Deslizar para ajustar su valoración"
+
+#: ../../mod/connedit.php:705 ../../mod/connedit.php:710
+msgid "Optionally explain your rating"
+msgstr "Opcionalmente, puede explicar su valoración"
+
+#: ../../mod/connedit.php:707
+msgid "Custom Filter"
+msgstr "Filtro personalizado"
+
+#: ../../mod/connedit.php:708
+msgid "Only import posts with this text"
+msgstr "Importar solo entradas que contengan este texto"
+
+#: ../../mod/connedit.php:708 ../../mod/connedit.php:709
+msgid ""
+"words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
+"all posts"
+msgstr "Una sola opción por línea: palabras, #etiquetas,  /patrones/ o lang=xx. Dejar en blanco para importarlo todo"
+
+#: ../../mod/connedit.php:709
+msgid "Do not import posts with this text"
+msgstr "No importar entradas que contengan este texto"
+
+#: ../../mod/connedit.php:711
+msgid "This information is public!"
+msgstr "¡Esta información es pública!"
+
+#: ../../mod/connedit.php:716
+msgid "Connection Pending Approval"
+msgstr "Conexión pendiente de aprobación"
+
+#: ../../mod/connedit.php:717
+msgid "Connection Request"
+msgstr "Solicitud de conexión"
+
+#: ../../mod/connedit.php:718
+#, php-format
+msgid ""
+"(%s) would like to connect with you. Please approve this connection to allow"
+" communication."
+msgstr "(%s) desearía conectar con usted. por favor, apruebe esta conexión para permitir la comunicación."
+
+#: ../../mod/connedit.php:720
+msgid "Approve Later"
+msgstr "Aprobar más tarde"
+
+#: ../../mod/connedit.php:723
+msgid "inherited"
+msgstr "heredado"
+
+#: ../../mod/connedit.php:725
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
+msgstr "Por favor, escoja el perfil que quiere mostrar a %s cuando esté viendo su perfil de forma segura."
+
+#: ../../mod/connedit.php:727
+msgid "Their Settings"
+msgstr "Sus ajustes"
+
+#: ../../mod/connedit.php:728
+msgid "My Settings"
+msgstr "Mis ajustes"
+
+#: ../../mod/connedit.php:730
+msgid "Individual Permissions"
+msgstr "Permisos individuales"
+
+#: ../../mod/connedit.php:731
+msgid ""
+"Some permissions may be inherited from your channel's <a "
+"href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
+"priority than individual settings. You can <strong>not</strong> change those"
+" settings here."
+msgstr "Algunos permisos pueden ser heredados de los <a href=\"settings\"><strong>ajustes de privacidad</strong></a> de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. <strong>No</strong> puede cambiar estos ajustes aquí."
+
+#: ../../mod/connedit.php:732
+msgid ""
+"Some permissions may be inherited from your channel's <a "
+"href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
+"priority than individual settings. You can change those settings here but "
+"they wont have any impact unless the inherited setting changes."
+msgstr "Algunos permisos pueden ser heredados de los <a href=\"settings\"><strong>ajustes de privacidad</strong></a> de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. Puede cambiar estos ajustes aquí, pero no tendrán ningún consecuencia hasta que cambie los ajustes heredados."
+
+#: ../../mod/connedit.php:733
+msgid "Last update:"
+msgstr "Última actualización:"
+
 #: ../../mod/sharedwithme.php:94
 msgid "Files: shared with me"
 msgstr "Ficheros: compartidos conmigo"
@@ -9278,6 +9317,14 @@ msgstr "Búsqueda de canales"
 msgid "Lookup xchan beginning with (or webbie): "
 msgstr "Buscar un canal (o un \"webbie\") que comience por:"
 
+#: ../../mod/cover_photo.php:130 ../../mod/cover_photo.php:177
+msgid "Cover Photos"
+msgstr "Imágenes de portada del perfil"
+
+#: ../../mod/cover_photo.php:352
+msgid "Upload Cover Photo"
+msgstr "Subir imagen de portada del perfil"
+
 #: ../../view/theme/redbasic/php/config.php:82
 msgid "Focus (Hubzilla default)"
 msgstr "Focus (predefinido)"
diff --git a/view/es-es/hstrings.php b/view/es-es/hstrings.php
index 3fb186d79..313683578 100644
--- a/view/es-es/hstrings.php
+++ b/view/es-es/hstrings.php
@@ -60,7 +60,7 @@ $a->strings["starred"] = "preferidas";
 $a->strings["Message signature validated"] = "Firma de mensaje validada";
 $a->strings["Message signature incorrect"] = "Firma de mensaje incorrecta";
 $a->strings["Add Tag"] = "Añadir etiqueta";
-$a->strings["I like this (toggle)"] = "me gusta (cambiar)";
+$a->strings["I like this (toggle)"] = "Me gusta (cambiar)";
 $a->strings["like"] = "me gusta";
 $a->strings["I don't like this (toggle)"] = "No me gusta esto (cambiar)";
 $a->strings["dislike"] = "no me gusta";
@@ -267,8 +267,8 @@ $a->strings["event"] = "evento";
 $a->strings["channel"] = "el canal";
 $a->strings["status"] = "el mensaje de estado";
 $a->strings["comment"] = "el comentario";
-$a->strings["%1\$s likes %2\$s's %3\$s"] = "a %1\$s le gusta %3\$s de %2\$s";
-$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "a %1\$s no le gusta %3\$s de %2\$s";
+$a->strings["%1\$s likes %2\$s's %3\$s"] = "A %1\$s le gusta %3\$s de %2\$s";
+$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "A %1\$s no le gusta %3\$s de %2\$s";
 $a->strings["%1\$s is now connected with %2\$s"] = "%1\$s ahora está conectado/a con %2\$s";
 $a->strings["%1\$s poked %2\$s"] = "%1\$s ha dado un toque a %2\$s";
 $a->strings["poked"] = "ha dado un toque a";
@@ -297,23 +297,23 @@ $a->strings["View Photos"] = "Ver fotos";
 $a->strings["Activity/Posts"] = "Actividad y publicaciones";
 $a->strings["Edit Connection"] = "Editar conexión";
 $a->strings["Send PM"] = "Enviar un mensaje privado";
-$a->strings["%s likes this."] = "a %s le gusta esto.";
-$a->strings["%s doesn't like this."] = "a %s no le gusta esto.";
+$a->strings["%s likes this."] = "A %s le gusta esto.";
+$a->strings["%s doesn't like this."] = "A %s no le gusta esto.";
 $a->strings["<span  %1\$s>%2\$d people</span> like this."] = array(
 	0 => "a <span %1\$s>%2\$d personas</span> le gusta esto.",
-	1 => "a <span  %1\$s>%2\$d personas</span> les gusta esto.",
+	1 => "A <span  %1\$s>%2\$d personas</span> les gusta esto.",
 );
 $a->strings["<span  %1\$s>%2\$d people</span> don't like this."] = array(
 	0 => "a <span %1\$s>%2\$d personas</span> no les gusta esto.",
-	1 => "a <span  %1\$s>%2\$d personas</span> no les gusta esto.",
+	1 => "A <span  %1\$s>%2\$d personas</span> no les gusta esto.",
 );
 $a->strings["and"] = "y";
 $a->strings[", and %d other people"] = array(
 	0 => ", y %d persona más",
 	1 => ", y %d personas más",
 );
-$a->strings["%s like this."] = "a %s le gusta esto.";
-$a->strings["%s don't like this."] = "a %s no le gusta esto.";
+$a->strings["%s like this."] = "A %s le gusta esto.";
+$a->strings["%s don't like this."] = "A %s no le gusta esto.";
 $a->strings["Visible to <strong>everybody</strong>"] = "Visible para <strong>cualquiera</strong>";
 $a->strings["Please enter a link URL:"] = "Por favor, introduzca la dirección del enlace:";
 $a->strings["Please enter a video link/URL:"] = "Por favor, introduzca un enlace de vídeo:";
@@ -523,7 +523,7 @@ $a->strings["Filter incoming posts from connections based on keywords/content"]
 $a->strings["Suggest Channels"] = "Sugerir canales";
 $a->strings["Show channel suggestions"] = "Mostrar sugerencias de canales";
 $a->strings["Post/Comment Tools"] = "Gestión de entradas y comentarios";
-$a->strings["Community Tagging"] = "Etiquetado de la comunidad";
+$a->strings["Community Tagging"] = "Etiquetas de la comunidad";
 $a->strings["Ability to tag existing posts"] = "Capacidad de etiquetar entradas existentes";
 $a->strings["Post Categories"] = "Categorías de entradas";
 $a->strings["Add categories to your posts"] = "Añadir categorías a sus publicaciones";
@@ -609,6 +609,7 @@ $a->strings["Love/Romance:"] = "Vida sentimental/amorosa:";
 $a->strings["Work/employment:"] = "Trabajo:";
 $a->strings["School/education:"] = "Estudios:";
 $a->strings["Like this thing"] = "Me gusta esto";
+$a->strings["cover photo"] = "Imagen de portada del perfil";
 $a->strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "No se ha podido crear un canal con un identificador que ya existe en este sistema. La importación ha fallado.";
 $a->strings["Channel clone failed. Import failed."] = "La clonación del canal no ha salido bien. La importación ha fallado.";
 $a->strings["Cloned channel not found. Import failed."] = "No se ha podido importar el canal porque el canal clonado no se ha encontrado.";
@@ -937,6 +938,10 @@ $a->strings["Blocks"] = "Bloques";
 $a->strings["Menus"] = "Menús";
 $a->strings["Layouts"] = "Formato gráfico";
 $a->strings["Pages"] = "Páginas";
+$a->strings["Invalid data packet"] = "Paquete de datos no válido";
+$a->strings["Unable to verify channel signature"] = "No ha sido posible de verificar la firma del canal";
+$a->strings["Unable to verify site signature for %s"] = "No ha sido posible de verificar la firma del sitio para %s";
+$a->strings["invalid target signature"] = "La firma recibida no es válida";
 $a->strings["System"] = "Sistema";
 $a->strings["Create Personal App"] = "Crear una aplicación personal";
 $a->strings["Edit Personal App"] = "Editar una aplicación personal";
@@ -945,8 +950,8 @@ $a->strings["Suggestions"] = "Sugerencias";
 $a->strings["See more..."] = "Ver más...";
 $a->strings["You have %1$.0f of %2$.0f allowed connections."] = "Tiene %1$.0f de %2$.0f conexiones permitidas.";
 $a->strings["Add New Connection"] = "Añadir nueva conexión";
-$a->strings["Enter the channel address"] = "Introducir la dirección del canal";
-$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Ejemplo: paco@ejemplo.com, http://ejemplo.com/paco";
+$a->strings["Enter channel address"] = "Dirección del canal";
+$a->strings["Examples: bob@example.com, https://example.com/barbara"] = "Ejemplos: manuel@ejemplo.com, https://ejemplo.com/carmen";
 $a->strings["Notes"] = "Notas";
 $a->strings["Remove term"] = "Eliminar término";
 $a->strings["Archives"] = "Hemeroteca";
@@ -1007,10 +1012,6 @@ $a->strings["Plugin Features"] = "Extensiones";
 $a->strings["User registrations waiting for confirmation"] = "Registros de usuarios pendientes de confirmación";
 $a->strings["View Photo"] = "Ver foto";
 $a->strings["Edit Album"] = "Editar álbum";
-$a->strings["Invalid data packet"] = "Paquete de datos no válido";
-$a->strings["Unable to verify channel signature"] = "No ha sido posible de verificar la firma del canal";
-$a->strings["Unable to verify site signature for %s"] = "No ha sido posible de verificar la firma del sitio para %s";
-$a->strings["invalid target signature"] = "La firma recibida no es válida";
 $a->strings["Not Found"] = "No encontrado";
 $a->strings["Page not found."] = "Página no encontrada.";
 $a->strings["Some blurb about what to do when you're new here"] = "Algunas propuestas para el nuevo usuario sobre qué se puede hacer aquí";
@@ -1187,6 +1188,10 @@ $a->strings["Enable"] = "Activar";
 $a->strings["Toggle"] = "Cambiar";
 $a->strings["Author: "] = "Autor:";
 $a->strings["Maintainer: "] = "Mantenedor:";
+$a->strings["Minimum project version: "] = "Versión mínima del proyecto:";
+$a->strings["Maximum project version: "] = "Versión máxima del proyecto:";
+$a->strings["Minimum PHP version: "] = "Versión mínima de PHP:";
+$a->strings["Disabled - version incompatibility"] = "Deshabilitado - versiones incompatibles";
 $a->strings["No themes found."] = "No se han encontrado temas.";
 $a->strings["Screenshot"] = "Instantánea de pantalla";
 $a->strings["[Experimental]"] = "[Experimental]";
@@ -1263,80 +1268,21 @@ $a->strings["Blocked"] = "Bloqueadas";
 $a->strings["Ignored"] = "Ignoradas";
 $a->strings["Hidden"] = "Ocultas";
 $a->strings["Archived"] = "Archivadas";
-$a->strings["Suggest new connections"] = "Sugerir nuevas conexiones";
 $a->strings["New Connections"] = "Nuevas conexiones";
 $a->strings["Show pending (new) connections"] = "Mostrar conexiones (nuevas) pendientes";
 $a->strings["All Connections"] = "Todas las conexiones";
 $a->strings["Show all connections"] = "Mostrar todas las conexiones";
-$a->strings["Unblocked"] = "Desbloqueadas";
-$a->strings["Only show unblocked connections"] = "Mostrar solo las conexiones desbloqueadas";
 $a->strings["Only show blocked connections"] = "Mostrar solo las conexiones bloqueadas";
 $a->strings["Only show ignored connections"] = "Mostrar solo conexiones ignoradas";
 $a->strings["Only show archived connections"] = "Mostrar solo las conexiones archivadas";
 $a->strings["Only show hidden connections"] = "Mostrar solo las conexiones ocultas";
+$a->strings["Pending"] = "Pendiente";
 $a->strings["%1\$s [%2\$s]"] = "%1\$s [%2\$s]";
 $a->strings["Edit connection"] = "Editar conexión";
+$a->strings["Delete connection"] = "Eliminar conexión";
+$a->strings["Connected"] = "Conectado/a";
 $a->strings["Search your connections"] = "Buscar sus conexiones";
-$a->strings["Finding: "] = "Búsqueda:";
-$a->strings["Could not access contact record."] = "No se ha podido acceder al registro de contacto.";
-$a->strings["Could not locate selected profile."] = "No se ha podido localizar el perfil seleccionado.";
-$a->strings["Connection updated."] = "Conexión actualizada.";
-$a->strings["Failed to update connection record."] = "Error al actualizar el registro de la conexión.";
-$a->strings["is now connected to"] = "ahora está conectado/a";
-$a->strings["Could not access address book record."] = "No se pudo acceder al registro en su libreta de direcciones.";
-$a->strings["Refresh failed - channel is currently unavailable."] = "Recarga fallida - no se puede encontrar el canal en este momento.";
-$a->strings["Unable to set address book parameters."] = "No ha sido posible establecer los parámetros de la libreta de direcciones.";
-$a->strings["Connection has been removed."] = "La conexión ha sido eliminada.";
-$a->strings["View %s's profile"] = "Ver el perfil de %s";
-$a->strings["Refresh Permissions"] = "Recargar los permisos";
-$a->strings["Fetch updated permissions"] = "Obtener los permisos actualizados";
-$a->strings["Recent Activity"] = "Actividad reciente";
-$a->strings["View recent posts and comments"] = "Ver publicaciones y comentarios recientes";
-$a->strings["Block (or Unblock) all communications with this connection"] = "Bloquear (o desbloquear) todas las comunicaciones con esta conexión";
-$a->strings["This connection is blocked!"] = "¡Esta conexión está bloqueada!";
-$a->strings["Unignore"] = "Dejar de ignorar";
-$a->strings["Ignore"] = "Ignorar";
-$a->strings["Ignore (or Unignore) all inbound communications from this connection"] = "Ignorar (o dejar de ignorar) todas las comunicaciones entrantes de esta conexión";
-$a->strings["This connection is ignored!"] = "¡Esta conexión es ignorada!";
-$a->strings["Unarchive"] = "Desarchivar";
-$a->strings["Archive"] = "Archivar";
-$a->strings["Archive (or Unarchive) this connection - mark channel dead but keep content"] = "Archiva (o desarchiva) esta conexión - marca el canal como muerto aunque mantiene sus contenidos";
-$a->strings["This connection is archived!"] = "¡Esta conexión esta archivada!";
-$a->strings["Unhide"] = "Mostrar";
-$a->strings["Hide"] = "Ocultar";
-$a->strings["Hide or Unhide this connection from your other connections"] = "Ocultar o mostrar esta conexión a sus otras conexiones";
-$a->strings["This connection is hidden!"] = "¡Esta conexión está oculta!";
-$a->strings["Delete this connection"] = "Eliminar esta conexión";
-$a->strings["Approve this connection"] = "Aprobar esta conexión";
-$a->strings["Accept connection to allow communication"] = "Aceptar la conexión para permitir la comunicación";
-$a->strings["Set Affinity"] = "Ajustar la afinidad";
-$a->strings["Set Profile"] = "Ajustar el perfil";
-$a->strings["Set Affinity & Profile"] = "Ajustar la afinidad y el perfil";
-$a->strings["none"] = "-";
-$a->strings["Apply these permissions automatically"] = "Aplicar estos permisos automaticamente";
-$a->strings["This connection's primary address is"] = "La dirección primaria de esta conexión es";
-$a->strings["Available locations:"] = "Ubicaciones disponibles:";
-$a->strings["The permissions indicated on this page will be applied to all new connections."] = "Los permisos indicados en esta página serán aplicados en todas las nuevas conexiones.";
-$a->strings["Slide to adjust your degree of friendship"] = "Deslizar para ajustar el grado de amistad";
-$a->strings["Slide to adjust your rating"] = "Deslizar para ajustar su valoración";
-$a->strings["Optionally explain your rating"] = "Opcionalmente, puede explicar su valoración";
-$a->strings["Custom Filter"] = "Filtro personalizado";
-$a->strings["Only import posts with this text"] = "Importar solo entradas que contengan este texto";
-$a->strings["words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts"] = "Una sola opción por línea: palabras, #etiquetas,  /patrones/ o lang=xx. Dejar en blanco para importarlo todo";
-$a->strings["Do not import posts with this text"] = "No importar entradas que contengan este texto";
-$a->strings["This information is public!"] = "¡Esta información es pública!";
-$a->strings["Connection Pending Approval"] = "Conexión pendiente de aprobación";
-$a->strings["Connection Request"] = "Solicitud de conexión";
-$a->strings["(%s) would like to connect with you. Please approve this connection to allow communication."] = "(%s) desearía conectar con usted. por favor, apruebe esta conexión para permitir la comunicación.";
-$a->strings["Approve Later"] = "Aprobar más tarde";
-$a->strings["inherited"] = "heredado";
-$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Por favor, escoja el perfil que quiere mostrar a %s cuando esté viendo su perfil de forma segura.";
-$a->strings["Their Settings"] = "Sus ajustes";
-$a->strings["My Settings"] = "Mis ajustes";
-$a->strings["Individual Permissions"] = "Permisos individuales";
-$a->strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can <strong>not</strong> change those settings here."] = "Algunos permisos pueden ser heredados de los <a href=\"settings\"><strong>ajustes de privacidad</strong></a> de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. <strong>No</strong> puede cambiar estos ajustes aquí.";
-$a->strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes."] = "Algunos permisos pueden ser heredados de los <a href=\"settings\"><strong>ajustes de privacidad</strong></a> de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. Puede cambiar estos ajustes aquí, pero no tendrán ningún consecuencia hasta que cambie los ajustes heredados.";
-$a->strings["Last update:"] = "Última actualización:";
+$a->strings["Connections search"] = "Buscar conexiones";
 $a->strings["\$Projectname channel"] = "Canal \$Projectname";
 $a->strings["Public access denied."] = "Acceso público denegado.";
 $a->strings["%d rating"] = array(
@@ -1685,6 +1631,7 @@ $a->strings["Channel Type"] = "Tipo de canal";
 $a->strings["Read more about roles"] = "Leer más sobre los roles";
 $a->strings["Invalid request identifier."] = "Petición inválida del identificador.";
 $a->strings["Discard"] = "Descartar";
+$a->strings["Ignore"] = "Ignorar";
 $a->strings["No more system notifications."] = "No hay más notificaciones del sistema";
 $a->strings["System Notifications"] = "Notificaciones de sistema";
 $a->strings["Unable to find your hub."] = "No se puede encontrar su servidor.";
@@ -1861,6 +1808,7 @@ $a->strings["Passwords do not match."] = "Las contraseñas no coinciden.";
 $a->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.";
 $a->strings["Your registration is pending approval by the site owner."] = "Su registro está pendiente de aprobación por el propietario del sitio.";
 $a->strings["Your registration can not be processed."] = "Su registro no puede ser procesado.";
+$a->strings["Registration on this site is disabled."] = "El registro está deshabilitado en este sitio.";
 $a->strings["Registration on this site/hub is by approval only."] = "El registro en este servidor/hub está sometido a aprobación previa.";
 $a->strings["<a href=\"pubsites\">Register at another affiliated site/hub</a>"] = "<a href=\"pubsites\">Inscribirse en un servidor/hub afiliado</a>";
 $a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Este sitio ha excedido el límite de inscripción diaria de cuentas. Por favor, inténtelo de nuevo mañana.";
@@ -1869,6 +1817,7 @@ $a->strings["I accept the %s for this website"] = "Acepto los %s de este sitio";
 $a->strings["I am over 13 years of age and accept the %s for this website"] = "Tengo más de 13 años de edad y acepto los %s de este sitio";
 $a->strings["Membership on this site is by invitation only."] = "Para registrarse en este sitio es necesaria una invitación.";
 $a->strings["Please enter your invitation code"] = "Por favor, introduzca el código de su invitación";
+$a->strings["Enter your name"] = "Su nombre";
 $a->strings["Your email address"] = "Su dirección de correo electrónico";
 $a->strings["Choose a password"] = "Elija una contraseña";
 $a->strings["Please re-enter your password"] = "Por favor, vuelva a escribir su contraseña";
@@ -2118,6 +2067,64 @@ $a->strings["The database configuration file \".htconfig.php\" could not be writ
 $a->strings["Errors encountered creating database tables."] = "Se han encontrado errores al crear las tablas de la base de datos.";
 $a->strings["<h1>What next</h1>"] = "<h1>Siguiente paso</h1>";
 $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANTE: Debe crear [manualmente] una tarea programada para el \"poller\".";
+$a->strings["Could not access contact record."] = "No se ha podido acceder al registro de contacto.";
+$a->strings["Could not locate selected profile."] = "No se ha podido localizar el perfil seleccionado.";
+$a->strings["Connection updated."] = "Conexión actualizada.";
+$a->strings["Failed to update connection record."] = "Error al actualizar el registro de la conexión.";
+$a->strings["is now connected to"] = "ahora está conectado/a";
+$a->strings["Could not access address book record."] = "No se pudo acceder al registro en su libreta de direcciones.";
+$a->strings["Refresh failed - channel is currently unavailable."] = "Recarga fallida - no se puede encontrar el canal en este momento.";
+$a->strings["Unable to set address book parameters."] = "No ha sido posible establecer los parámetros de la libreta de direcciones.";
+$a->strings["Connection has been removed."] = "La conexión ha sido eliminada.";
+$a->strings["View %s's profile"] = "Ver el perfil de %s";
+$a->strings["Refresh Permissions"] = "Recargar los permisos";
+$a->strings["Fetch updated permissions"] = "Obtener los permisos actualizados";
+$a->strings["Recent Activity"] = "Actividad reciente";
+$a->strings["View recent posts and comments"] = "Ver publicaciones y comentarios recientes";
+$a->strings["Block (or Unblock) all communications with this connection"] = "Bloquear (o desbloquear) todas las comunicaciones con esta conexión";
+$a->strings["This connection is blocked!"] = "¡Esta conexión está bloqueada!";
+$a->strings["Unignore"] = "Dejar de ignorar";
+$a->strings["Ignore (or Unignore) all inbound communications from this connection"] = "Ignorar (o dejar de ignorar) todas las comunicaciones entrantes de esta conexión";
+$a->strings["This connection is ignored!"] = "¡Esta conexión es ignorada!";
+$a->strings["Unarchive"] = "Desarchivar";
+$a->strings["Archive"] = "Archivar";
+$a->strings["Archive (or Unarchive) this connection - mark channel dead but keep content"] = "Archiva (o desarchiva) esta conexión - marca el canal como muerto aunque mantiene sus contenidos";
+$a->strings["This connection is archived!"] = "¡Esta conexión esta archivada!";
+$a->strings["Unhide"] = "Mostrar";
+$a->strings["Hide"] = "Ocultar";
+$a->strings["Hide or Unhide this connection from your other connections"] = "Ocultar o mostrar esta conexión a sus otras conexiones";
+$a->strings["This connection is hidden!"] = "¡Esta conexión está oculta!";
+$a->strings["Delete this connection"] = "Eliminar esta conexión";
+$a->strings["Approve this connection"] = "Aprobar esta conexión";
+$a->strings["Accept connection to allow communication"] = "Aceptar la conexión para permitir la comunicación";
+$a->strings["Set Affinity"] = "Ajustar la afinidad";
+$a->strings["Set Profile"] = "Ajustar el perfil";
+$a->strings["Set Affinity & Profile"] = "Ajustar la afinidad y el perfil";
+$a->strings["none"] = "-";
+$a->strings["Apply these permissions automatically"] = "Aplicar estos permisos automaticamente";
+$a->strings["This connection's primary address is"] = "La dirección primaria de esta conexión es";
+$a->strings["Available locations:"] = "Ubicaciones disponibles:";
+$a->strings["The permissions indicated on this page will be applied to all new connections."] = "Los permisos indicados en esta página serán aplicados en todas las nuevas conexiones.";
+$a->strings["Slide to adjust your degree of friendship"] = "Deslizar para ajustar el grado de amistad";
+$a->strings["Slide to adjust your rating"] = "Deslizar para ajustar su valoración";
+$a->strings["Optionally explain your rating"] = "Opcionalmente, puede explicar su valoración";
+$a->strings["Custom Filter"] = "Filtro personalizado";
+$a->strings["Only import posts with this text"] = "Importar solo entradas que contengan este texto";
+$a->strings["words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts"] = "Una sola opción por línea: palabras, #etiquetas,  /patrones/ o lang=xx. Dejar en blanco para importarlo todo";
+$a->strings["Do not import posts with this text"] = "No importar entradas que contengan este texto";
+$a->strings["This information is public!"] = "¡Esta información es pública!";
+$a->strings["Connection Pending Approval"] = "Conexión pendiente de aprobación";
+$a->strings["Connection Request"] = "Solicitud de conexión";
+$a->strings["(%s) would like to connect with you. Please approve this connection to allow communication."] = "(%s) desearía conectar con usted. por favor, apruebe esta conexión para permitir la comunicación.";
+$a->strings["Approve Later"] = "Aprobar más tarde";
+$a->strings["inherited"] = "heredado";
+$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Por favor, escoja el perfil que quiere mostrar a %s cuando esté viendo su perfil de forma segura.";
+$a->strings["Their Settings"] = "Sus ajustes";
+$a->strings["My Settings"] = "Mis ajustes";
+$a->strings["Individual Permissions"] = "Permisos individuales";
+$a->strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can <strong>not</strong> change those settings here."] = "Algunos permisos pueden ser heredados de los <a href=\"settings\"><strong>ajustes de privacidad</strong></a> de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. <strong>No</strong> puede cambiar estos ajustes aquí.";
+$a->strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes."] = "Algunos permisos pueden ser heredados de los <a href=\"settings\"><strong>ajustes de privacidad</strong></a> de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. Puede cambiar estos ajustes aquí, pero no tendrán ningún consecuencia hasta que cambie los ajustes heredados.";
+$a->strings["Last update:"] = "Última actualización:";
 $a->strings["Files: shared with me"] = "Ficheros: compartidos conmigo";
 $a->strings["NEW"] = "NUEVO";
 $a->strings["Remove all files"] = "Eliminar todos los ficheros";
@@ -2185,6 +2192,8 @@ $a->strings["Source of Item"] = "Origen del elemento";
 $a->strings["Page Title"] = "Título de página";
 $a->strings["Xchan Lookup"] = "Búsqueda de canales";
 $a->strings["Lookup xchan beginning with (or webbie): "] = "Buscar un canal (o un \"webbie\") que comience por:";
+$a->strings["Cover Photos"] = "Imágenes de portada del perfil";
+$a->strings["Upload Cover Photo"] = "Subir imagen de portada del perfil";
 $a->strings["Focus (Hubzilla default)"] = "Focus (predefinido)";
 $a->strings["Theme settings"] = "Ajustes del tema";
 $a->strings["Select scheme"] = "Elegir un esquema";
diff --git a/view/fr/htconfig.tpl b/view/fr/htconfig.tpl
index 430d97a47..1e7e14fb4 100644
--- a/view/fr/htconfig.tpl
+++ b/view/fr/htconfig.tpl
@@ -10,6 +10,7 @@ $db_port = '{{$dbport}}';
 $db_user = '{{$dbuser}}';
 $db_pass = '{{$dbpass}}';
 $db_data = '{{$dbdata}}';
+$db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres
 
 /*
  * Note: Plusieurs de ces réglages seront disponibles via le panneau d'administration
diff --git a/view/it/htconfig.tpl b/view/it/htconfig.tpl
index cc4087f96..773125154 100644
--- a/view/it/htconfig.tpl
+++ b/view/it/htconfig.tpl
@@ -8,6 +8,7 @@ $db_port = '{{$dbport}}';
 $db_user = '{{$dbuser}}';
 $db_pass = '{{$dbpass}}';
 $db_data = '{{$dbdata}}';
+$db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres
 
 /*
  * Notice: Many of the following settings will be available in the admin panel 
diff --git a/view/nb-no/htconfig.tpl b/view/nb-no/htconfig.tpl
index cc4087f96..773125154 100644
--- a/view/nb-no/htconfig.tpl
+++ b/view/nb-no/htconfig.tpl
@@ -8,6 +8,7 @@ $db_port = '{{$dbport}}';
 $db_user = '{{$dbuser}}';
 $db_pass = '{{$dbpass}}';
 $db_data = '{{$dbdata}}';
+$db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres
 
 /*
  * Notice: Many of the following settings will be available in the admin panel 
diff --git a/view/nl/hmessages.po b/view/nl/hmessages.po
index bb21deb93..9bbdbdf26 100644
--- a/view/nl/hmessages.po
+++ b/view/nl/hmessages.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Redmatrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-08 00:03-0800\n"
-"PO-Revision-Date: 2016-01-10 19:40+0000\n"
+"POT-Creation-Date: 2016-01-15 00:03-0800\n"
+"PO-Revision-Date: 2016-01-17 18:45+0000\n"
 "Last-Translator: jeroenpraat <jeroenpraat@xs4all.nl>\n"
 "Language-Team: Dutch (http://www.transifex.com/Friendica/red-matrix/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -30,62 +30,62 @@ msgstr "Authenticatie op afstand geblokkeerd. Je bent lokaal op deze hub ingelog
 msgid "Welcome %s. Remote authentication successful."
 msgstr "Welkom %s. Authenticatie op afstand geslaagd."
 
-#: ../../boot.php:1304
+#: ../../boot.php:1319
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "Update %s mislukt. Zie foutenlogboek."
 
-#: ../../boot.php:1307
+#: ../../boot.php:1322
 #, php-format
 msgid "Update Error at %s"
 msgstr "Update-fout op %s"
 
-#: ../../boot.php:1474
+#: ../../boot.php:1489
 msgid ""
 "Create an account to access services and applications within the Hubzilla"
 msgstr "Maak een account aan om toegang te krijgen tot diensten en toepassingen van Hubzilla"
 
-#: ../../boot.php:1475 ../../include/nav.php:149 ../../mod/register.php:226
+#: ../../boot.php:1490 ../../include/nav.php:149 ../../mod/register.php:264
 msgid "Register"
 msgstr "Registreren"
 
-#: ../../boot.php:1492 ../../include/nav.php:82 ../../include/nav.php:114
+#: ../../boot.php:1507 ../../include/nav.php:82 ../../include/nav.php:114
 msgid "Logout"
 msgstr "Uitloggen"
 
-#: ../../boot.php:1493 ../../include/apps.php:131 ../../include/nav.php:111
+#: ../../boot.php:1508 ../../include/apps.php:131 ../../include/nav.php:111
 msgid "Login"
 msgstr "Inloggen"
 
-#: ../../boot.php:1495 ../../include/contact_selectors.php:79
+#: ../../boot.php:1510 ../../include/contact_selectors.php:79
 #: ../../mod/admin.php:891 ../../mod/admin.php:900 ../../mod/id.php:15
 #: ../../mod/id.php:16
 msgid "Email"
 msgstr "E-mail"
 
-#: ../../boot.php:1496
+#: ../../boot.php:1511
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: ../../boot.php:1497
+#: ../../boot.php:1512
 msgid "Remember me"
 msgstr "Aangemeld blijven"
 
-#: ../../boot.php:1497 ../../include/dir_fns.php:141
+#: ../../boot.php:1512 ../../include/dir_fns.php:141
 #: ../../include/dir_fns.php:142 ../../include/dir_fns.php:143
-#: ../../mod/admin.php:421 ../../mod/api.php:102 ../../mod/connedit.php:641
-#: ../../mod/connedit.php:690 ../../mod/events.php:447
+#: ../../mod/admin.php:421 ../../mod/api.php:102 ../../mod/events.php:447
 #: ../../mod/events.php:448 ../../mod/events.php:457
 #: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
 #: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/mitem.php:154
 #: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229
 #: ../../mod/photos.php:626 ../../mod/removeme.php:60
-#: ../../mod/settings.php:577 ../../view/theme/redbasic/php/config.php:104
+#: ../../mod/settings.php:577 ../../mod/connedit.php:644
+#: ../../mod/connedit.php:693 ../../view/theme/redbasic/php/config.php:104
 #: ../../view/theme/redbasic/php/config.php:129
 msgid "No"
 msgstr "Nee"
 
-#: ../../boot.php:1497 ../../include/dir_fns.php:141
+#: ../../boot.php:1512 ../../include/dir_fns.php:141
 #: ../../include/dir_fns.php:142 ../../include/dir_fns.php:143
 #: ../../mod/admin.php:423 ../../mod/api.php:101 ../../mod/events.php:447
 #: ../../mod/events.php:448 ../../mod/events.php:457
@@ -98,36 +98,36 @@ msgstr "Nee"
 msgid "Yes"
 msgstr "Ja"
 
-#: ../../boot.php:1500
+#: ../../boot.php:1515
 msgid "Forgot your password?"
 msgstr "Wachtwoord vergeten?"
 
-#: ../../boot.php:1501 ../../mod/lostpass.php:86
+#: ../../boot.php:1516 ../../mod/lostpass.php:86
 msgid "Password Reset"
 msgstr "Wachtwoord vergeten?"
 
-#: ../../boot.php:2120
+#: ../../boot.php:2137
 msgid "toggle mobile"
 msgstr "mobiele weergave omschakelen"
 
-#: ../../boot.php:2272
+#: ../../boot.php:2289
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr "Het SSL-certificaat van deze website is ongeldig. Corrigeer dit a.u.b."
 
-#: ../../boot.php:2275
+#: ../../boot.php:2292
 #, php-format
 msgid "[hubzilla] Website SSL error for %s"
 msgstr "[hubzilla] Probleem met SSL-certificaat voor %s"
 
-#: ../../boot.php:2312
+#: ../../boot.php:2329
 msgid "Cron/Scheduled tasks not running."
 msgstr "Cron is niet actief"
 
-#: ../../boot.php:2313 ../../include/datetime.php:263
+#: ../../boot.php:2330 ../../include/datetime.php:263
 msgid "never"
 msgstr "nooit"
 
-#: ../../boot.php:2316
+#: ../../boot.php:2333
 #, php-format
 msgid "[hubzilla] Cron tasks not running on %s"
 msgstr "[hubzilla] Cron-taken zijn niet actief op %s"
@@ -171,8 +171,8 @@ msgstr "Niet voor iedereen zichtbaar"
 #: ../../include/ItemObject.php:100 ../../include/RedDAV/RedBrowser.php:240
 #: ../../include/apps.php:259 ../../include/menu.php:108
 #: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36
-#: ../../mod/blocks.php:153 ../../mod/connections.php:235
-#: ../../mod/connections.php:248 ../../mod/connections.php:267
+#: ../../mod/blocks.php:153 ../../mod/connections.php:262
+#: ../../mod/connections.php:281 ../../mod/connections.php:301
 #: ../../mod/editblock.php:135 ../../mod/editlayout.php:134
 #: ../../mod/editpost.php:112 ../../mod/editwebpage.php:176
 #: ../../mod/layouts.php:183 ../../mod/menu.php:108 ../../mod/settings.php:648
@@ -183,11 +183,11 @@ msgstr "Bewerken"
 #: ../../include/ItemObject.php:120 ../../include/RedDAV/RedBrowser.php:241
 #: ../../include/apps.php:260 ../../include/conversation.php:657
 #: ../../mod/admin.php:895 ../../mod/admin.php:1054 ../../mod/blocks.php:155
-#: ../../mod/connedit.php:557 ../../mod/editblock.php:181
+#: ../../mod/connections.php:263 ../../mod/editblock.php:181
 #: ../../mod/editlayout.php:179 ../../mod/editwebpage.php:223
 #: ../../mod/group.php:173 ../../mod/photos.php:1126
-#: ../../mod/settings.php:649 ../../mod/thing.php:258
-#: ../../mod/webpages.php:183
+#: ../../mod/settings.php:649 ../../mod/connedit.php:560
+#: ../../mod/thing.php:258 ../../mod/webpages.php:183
 msgid "Delete"
 msgstr "Verwijderen"
 
@@ -396,12 +396,11 @@ msgstr "Reactie"
 #: ../../include/ItemObject.php:697 ../../include/js_strings.php:22
 #: ../../include/widgets.php:679 ../../include/widgets.php:691
 #: ../../mod/admin.php:453 ../../mod/admin.php:596 ../../mod/admin.php:888
-#: ../../mod/admin.php:1052 ../../mod/admin.php:1189 ../../mod/admin.php:1383
-#: ../../mod/admin.php:1468 ../../mod/appman.php:99 ../../mod/chat.php:184
-#: ../../mod/chat.php:213 ../../mod/connect.php:93 ../../mod/connedit.php:721
-#: ../../mod/events.php:461 ../../mod/events.php:658
-#: ../../mod/filestorage.php:156 ../../mod/fsuggest.php:108
-#: ../../mod/group.php:81 ../../mod/import.php:527
+#: ../../mod/admin.php:1052 ../../mod/admin.php:1228 ../../mod/admin.php:1423
+#: ../../mod/admin.php:1508 ../../mod/appman.php:99 ../../mod/chat.php:184
+#: ../../mod/chat.php:213 ../../mod/connect.php:93 ../../mod/events.php:461
+#: ../../mod/events.php:658 ../../mod/filestorage.php:156
+#: ../../mod/fsuggest.php:108 ../../mod/group.php:81 ../../mod/import.php:527
 #: ../../mod/import_items.php:122 ../../mod/invite.php:142
 #: ../../mod/locs.php:116 ../../mod/mail.php:380 ../../mod/mitem.php:231
 #: ../../mod/mood.php:135 ../../mod/pconfig.php:108 ../../mod/pdledit.php:58
@@ -411,9 +410,10 @@ msgstr "Reactie"
 #: ../../mod/settings.php:586 ../../mod/settings.php:698
 #: ../../mod/settings.php:726 ../../mod/settings.php:749
 #: ../../mod/settings.php:834 ../../mod/settings.php:1023
-#: ../../mod/setup.php:331 ../../mod/setup.php:371 ../../mod/sources.php:104
-#: ../../mod/sources.php:138 ../../mod/thing.php:313 ../../mod/thing.php:359
-#: ../../mod/xchan.php:11 ../../view/theme/redbasic/php/config.php:99
+#: ../../mod/setup.php:331 ../../mod/setup.php:371 ../../mod/connedit.php:724
+#: ../../mod/sources.php:104 ../../mod/sources.php:138 ../../mod/thing.php:313
+#: ../../mod/thing.php:359 ../../mod/xchan.php:11
+#: ../../view/theme/redbasic/php/config.php:99
 msgid "Submit"
 msgstr "Opslaan"
 
@@ -503,7 +503,7 @@ msgstr "Planning-postvak UIT"
 
 #: ../../include/RedDAV/RedBrowser.php:164 ../../include/apps.php:360
 #: ../../include/apps.php:415 ../../include/conversation.php:1027
-#: ../../include/widgets.php:1334 ../../mod/photos.php:754
+#: ../../include/widgets.php:1366 ../../mod/photos.php:754
 #: ../../mod/photos.php:1195
 msgid "Unknown"
 msgstr "Onbekend"
@@ -525,14 +525,15 @@ msgstr "Gedeeld"
 #: ../../include/RedDAV/RedBrowser.php:230
 #: ../../include/RedDAV/RedBrowser.php:303 ../../mod/blocks.php:152
 #: ../../mod/layouts.php:175 ../../mod/menu.php:114
-#: ../../mod/new_channel.php:133 ../../mod/webpages.php:180
+#: ../../mod/new_channel.php:133 ../../mod/register.php:255
+#: ../../mod/webpages.php:180
 msgid "Create"
 msgstr "Aanmaken"
 
 #: ../../include/RedDAV/RedBrowser.php:231
-#: ../../include/RedDAV/RedBrowser.php:305 ../../include/widgets.php:1347
+#: ../../include/RedDAV/RedBrowser.php:305 ../../include/widgets.php:1379
 #: ../../mod/photos.php:781 ../../mod/photos.php:1316
-#: ../../mod/profile_photo.php:453
+#: ../../mod/profile_photo.php:453 ../../mod/cover_photo.php:353
 msgid "Upload"
 msgstr "Uploaden"
 
@@ -577,80 +578,80 @@ msgstr "Nieuwe map aanmaken"
 msgid "Upload file"
 msgstr "Bestand uploaden"
 
-#: ../../include/account.php:27
+#: ../../include/account.php:28
 msgid "Not a valid email address"
 msgstr "Geen geldig e-mailadres"
 
-#: ../../include/account.php:29
+#: ../../include/account.php:30
 msgid "Your email domain is not among those allowed on this site"
 msgstr "Jouw e-maildomein is op deze hub niet toegestaan"
 
-#: ../../include/account.php:35
+#: ../../include/account.php:36
 msgid "Your email address is already registered at this site."
 msgstr "Jouw e-mailadres is al op deze hub geregistreerd."
 
-#: ../../include/account.php:67
+#: ../../include/account.php:68
 msgid "An invitation is required."
 msgstr "Een uitnodiging is vereist"
 
-#: ../../include/account.php:71
+#: ../../include/account.php:72
 msgid "Invitation could not be verified."
 msgstr "Uitnodiging kon niet geverifieerd worden"
 
-#: ../../include/account.php:121
+#: ../../include/account.php:122
 msgid "Please enter the required information."
 msgstr "Vul de vereiste informatie in."
 
-#: ../../include/account.php:188
+#: ../../include/account.php:189
 msgid "Failed to store account information."
 msgstr "Account-informatie kon niet opgeslagen worden."
 
-#: ../../include/account.php:248
+#: ../../include/account.php:249
 #, php-format
 msgid "Registration confirmation for %s"
 msgstr "Registratiebevestiging voor %s"
 
-#: ../../include/account.php:314
+#: ../../include/account.php:315
 #, php-format
 msgid "Registration request at %s"
 msgstr "Registratiebevestiging voor %s"
 
-#: ../../include/account.php:316 ../../include/account.php:343
-#: ../../include/account.php:403 ../../include/network.php:1655
+#: ../../include/account.php:317 ../../include/account.php:344
+#: ../../include/account.php:404 ../../include/network.php:1659
 msgid "Administrator"
 msgstr "Beheerder"
 
-#: ../../include/account.php:338
+#: ../../include/account.php:339
 msgid "your registration password"
 msgstr "jouw registratiewachtwoord"
 
-#: ../../include/account.php:341 ../../include/account.php:401
+#: ../../include/account.php:342 ../../include/account.php:402
 #, php-format
 msgid "Registration details for %s"
 msgstr "Registratiegegevens voor %s"
 
-#: ../../include/account.php:410
+#: ../../include/account.php:414
 msgid "Account approved."
 msgstr "Account goedgekeurd"
 
-#: ../../include/account.php:449
+#: ../../include/account.php:454
 #, php-format
 msgid "Registration revoked for %s"
 msgstr "Registratie ingetrokken voor %s"
 
-#: ../../include/account.php:494
+#: ../../include/account.php:506
 msgid "Account verified. Please login."
 msgstr "Account is geverifieerd. Je kan inloggen."
 
-#: ../../include/account.php:707 ../../include/account.php:709
+#: ../../include/account.php:719 ../../include/account.php:721
 msgid "Click here to upgrade."
 msgstr "Klik hier om te upgraden."
 
-#: ../../include/account.php:715
+#: ../../include/account.php:727
 msgid "This action exceeds the limits set by your subscription plan."
 msgstr "Deze handeling overschrijdt de beperkingen die voor jouw abonnement gelden."
 
-#: ../../include/account.php:720
+#: ../../include/account.php:732
 msgid "This action is not available under your subscription plan."
 msgstr "Deze handeling is niet mogelijk met jouw abonnement."
 
@@ -726,8 +727,8 @@ msgid "Grid"
 msgstr "Grid"
 
 #: ../../include/apps.php:134 ../../include/nav.php:202
-#: ../../include/widgets.php:557 ../../mod/admin.php:1150
-#: ../../mod/admin.php:1350
+#: ../../include/widgets.php:557 ../../mod/admin.php:1168
+#: ../../mod/admin.php:1390
 msgid "Settings"
 msgstr "Instellingen"
 
@@ -781,7 +782,7 @@ msgstr "Chatten"
 
 #: ../../include/apps.php:147 ../../include/nav.php:159
 #: ../../include/text.php:885 ../../include/text.php:897
-#: ../../mod/search.php:40
+#: ../../mod/connections.php:297 ../../mod/search.php:40
 msgid "Search"
 msgstr "Zoeken"
 
@@ -801,7 +802,7 @@ msgstr "Willekeurig kanaal"
 msgid "Invite"
 msgstr "Uitnodigen "
 
-#: ../../include/apps.php:152 ../../include/widgets.php:1220
+#: ../../include/apps.php:152 ../../include/widgets.php:1252
 msgid "Features"
 msgstr "Extra functies"
 
@@ -838,40 +839,41 @@ msgstr "Aanschaffen"
 #: ../../include/attach.php:436 ../../include/attach.php:888
 #: ../../include/attach.php:959 ../../include/attach.php:1111
 #: ../../include/chat.php:133 ../../include/items.php:4405
-#: ../../include/photos.php:29 ../../index.php:182 ../../index.php:365
+#: ../../include/photos.php:29 ../../index.php:182 ../../index.php:367
 #: ../../mod/achievements.php:30 ../../mod/api.php:26 ../../mod/api.php:31
 #: ../../mod/appman.php:66 ../../mod/authtest.php:13 ../../mod/block.php:22
 #: ../../mod/block.php:72 ../../mod/blocks.php:69 ../../mod/blocks.php:76
 #: ../../mod/bookmarks.php:48 ../../mod/channel.php:100
 #: ../../mod/channel.php:214 ../../mod/channel.php:254 ../../mod/chat.php:94
 #: ../../mod/chat.php:99 ../../mod/common.php:35 ../../mod/connections.php:29
-#: ../../mod/connedit.php:352 ../../mod/editblock.php:65
-#: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87
-#: ../../mod/editpost.php:13 ../../mod/editwebpage.php:64
-#: ../../mod/editwebpage.php:86 ../../mod/editwebpage.php:101
-#: ../../mod/editwebpage.php:125 ../../mod/events.php:260
-#: ../../mod/filestorage.php:18 ../../mod/filestorage.php:73
-#: ../../mod/filestorage.php:88 ../../mod/filestorage.php:115
-#: ../../mod/fsuggest.php:78 ../../mod/group.php:9 ../../mod/id.php:71
-#: ../../mod/invite.php:13 ../../mod/invite.php:87 ../../mod/item.php:206
-#: ../../mod/item.php:214 ../../mod/item.php:1049 ../../mod/layouts.php:69
-#: ../../mod/layouts.php:76 ../../mod/layouts.php:87 ../../mod/like.php:177
-#: ../../mod/locs.php:83 ../../mod/mail.php:126 ../../mod/manage.php:6
-#: ../../mod/menu.php:74 ../../mod/message.php:16 ../../mod/mitem.php:111
-#: ../../mod/mood.php:112 ../../mod/network.php:12
-#: ../../mod/new_channel.php:68 ../../mod/new_channel.php:99
-#: ../../mod/notifications.php:66 ../../mod/page.php:31 ../../mod/page.php:86
-#: ../../mod/pdledit.php:21 ../../mod/photos.php:70 ../../mod/poke.php:133
-#: ../../mod/profile.php:64 ../../mod/profile.php:72
-#: ../../mod/profile_photo.php:341 ../../mod/profile_photo.php:354
-#: ../../mod/profiles.php:198 ../../mod/profiles.php:584
-#: ../../mod/rate.php:111 ../../mod/register.php:72 ../../mod/regmod.php:17
-#: ../../mod/service_limits.php:7 ../../mod/settings.php:568
-#: ../../mod/setup.php:227 ../../mod/sharedwithme.php:7
+#: ../../mod/editblock.php:65 ../../mod/editlayout.php:63
+#: ../../mod/editlayout.php:87 ../../mod/editpost.php:13
+#: ../../mod/editwebpage.php:64 ../../mod/editwebpage.php:86
+#: ../../mod/editwebpage.php:101 ../../mod/editwebpage.php:125
+#: ../../mod/events.php:260 ../../mod/filestorage.php:18
+#: ../../mod/filestorage.php:73 ../../mod/filestorage.php:88
+#: ../../mod/filestorage.php:115 ../../mod/fsuggest.php:78
+#: ../../mod/group.php:9 ../../mod/id.php:71 ../../mod/invite.php:13
+#: ../../mod/invite.php:87 ../../mod/item.php:206 ../../mod/item.php:214
+#: ../../mod/item.php:1049 ../../mod/layouts.php:69 ../../mod/layouts.php:76
+#: ../../mod/layouts.php:87 ../../mod/like.php:177 ../../mod/locs.php:83
+#: ../../mod/mail.php:126 ../../mod/manage.php:6 ../../mod/menu.php:74
+#: ../../mod/message.php:16 ../../mod/mitem.php:111 ../../mod/mood.php:112
+#: ../../mod/network.php:12 ../../mod/new_channel.php:68
+#: ../../mod/new_channel.php:99 ../../mod/notifications.php:66
+#: ../../mod/page.php:31 ../../mod/page.php:86 ../../mod/pdledit.php:21
+#: ../../mod/photos.php:70 ../../mod/poke.php:133 ../../mod/profile.php:64
+#: ../../mod/profile.php:72 ../../mod/profile_photo.php:341
+#: ../../mod/profile_photo.php:354 ../../mod/profiles.php:198
+#: ../../mod/profiles.php:584 ../../mod/rate.php:111 ../../mod/register.php:73
+#: ../../mod/regmod.php:17 ../../mod/service_limits.php:7
+#: ../../mod/settings.php:568 ../../mod/setup.php:227
+#: ../../mod/connedit.php:355 ../../mod/sharedwithme.php:7
 #: ../../mod/sources.php:66 ../../mod/suggest.php:26 ../../mod/thing.php:271
 #: ../../mod/thing.php:291 ../../mod/thing.php:328
 #: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
 #: ../../mod/viewsrc.php:14 ../../mod/webpages.php:69
+#: ../../mod/cover_photo.php:273 ../../mod/cover_photo.php:286
 msgid "Permission denied."
 msgstr "Toegang geweigerd"
 
@@ -1157,7 +1159,7 @@ msgstr "Verbinden/volgen"
 msgid "Examples: Robert Morgenstein, Fishing"
 msgstr "Voorbeeld: Robert Morgenstein, vissen"
 
-#: ../../include/contact_widgets.php:26 ../../mod/connections.php:266
+#: ../../include/contact_widgets.php:26 ../../mod/connections.php:300
 #: ../../mod/directory.php:381 ../../mod/directory.php:386
 msgid "Find"
 msgstr "Vinden"
@@ -1346,7 +1348,7 @@ msgid "View Status"
 msgstr "Status weergeven"
 
 #: ../../include/conversation.php:950 ../../include/nav.php:86
-#: ../../mod/connedit.php:504
+#: ../../mod/connedit.php:507
 msgid "View Profile"
 msgstr "Profiel weergeven"
 
@@ -1828,19 +1830,19 @@ msgstr "Alleen openbare forums"
 msgid "This Website Only"
 msgstr "Alleen deze hub"
 
-#: ../../include/enotify.php:57 ../../include/network.php:1608
+#: ../../include/enotify.php:57 ../../include/network.php:1612
 msgid "$Projectname Notification"
 msgstr "$Projectname-notificatie"
 
-#: ../../include/enotify.php:58 ../../include/network.php:1609
+#: ../../include/enotify.php:58 ../../include/network.php:1613
 msgid "$projectname"
 msgstr "$projectname"
 
-#: ../../include/enotify.php:60 ../../include/network.php:1611
+#: ../../include/enotify.php:60 ../../include/network.php:1615
 msgid "Thank You,"
 msgstr "Bedankt,"
 
-#: ../../include/enotify.php:62 ../../include/network.php:1613
+#: ../../include/enotify.php:62 ../../include/network.php:1617
 #, php-format
 msgid "%s Administrator"
 msgstr "Beheerder %s"
@@ -2250,7 +2252,7 @@ msgstr "Verwantschapsfilter"
 
 #: ../../include/features.php:82
 msgid "Filter stream activity by depth of relationships"
-msgstr "Filter wat je in de Matrix ziet op hoe goed je iemand kent of mag"
+msgstr "Filter wat je in jouw grid ziet op hoe goed je iemand kent of mag"
 
 #: ../../include/features.php:83
 msgid "Connection Filtering"
@@ -2426,10 +2428,10 @@ msgstr "Standaardprofiel"
 
 #: ../../include/identity.php:390 ../../include/identity.php:391
 #: ../../include/identity.php:398 ../../include/profile_selectors.php:80
-#: ../../include/widgets.php:430 ../../mod/connedit.php:579
-#: ../../mod/settings.php:338 ../../mod/settings.php:342
-#: ../../mod/settings.php:343 ../../mod/settings.php:346
-#: ../../mod/settings.php:357
+#: ../../include/widgets.php:430 ../../mod/settings.php:338
+#: ../../mod/settings.php:342 ../../mod/settings.php:343
+#: ../../mod/settings.php:346 ../../mod/settings.php:357
+#: ../../mod/connedit.php:582
 msgid "Friends"
 msgstr "Vrienden"
 
@@ -2634,6 +2636,10 @@ msgstr "School/opleiding:"
 msgid "Like this thing"
 msgstr "Vind dit ding leuk"
 
+#: ../../include/identity.php:1759 ../../mod/cover_photo.php:236
+msgid "cover photo"
+msgstr "omslagfoto"
+
 #: ../../include/import.php:23
 msgid ""
 "Cannot create a duplicate channel identifier on this system. Import failed."
@@ -2647,7 +2653,7 @@ msgstr "Het klonen van het kanaal is mislukt. Importeren mislukt."
 msgid "Cloned channel not found. Import failed."
 msgstr "Gekloond kanaal niet gevonden. Importeren mislukt."
 
-#: ../../include/items.php:423 ../../index.php:364 ../../mod/dreport.php:6
+#: ../../include/items.php:423 ../../index.php:366 ../../mod/dreport.php:6
 #: ../../mod/dreport.php:45 ../../mod/group.php:68
 #: ../../mod/import_items.php:114 ../../mod/like.php:280
 #: ../../mod/profperm.php:23 ../../mod/subthread.php:58
@@ -2692,7 +2698,7 @@ msgid "Visible to specific connections."
 msgstr "Voor specifieke connecties zichtbaar."
 
 #: ../../include/items.php:4326 ../../mod/admin.php:135
-#: ../../mod/admin.php:1091 ../../mod/admin.php:1296 ../../mod/display.php:36
+#: ../../mod/admin.php:1091 ../../mod/admin.php:1336 ../../mod/display.php:36
 #: ../../mod/filestorage.php:27 ../../mod/thing.php:86
 #: ../../mod/viewsrc.php:20
 msgid "Item not found."
@@ -2711,7 +2717,7 @@ msgstr "Collectie is leeg"
 msgid "Collection: %s"
 msgstr "Collectie: %s"
 
-#: ../../include/items.php:4871 ../../mod/connedit.php:689
+#: ../../include/items.php:4871 ../../mod/connedit.php:692
 #, php-format
 msgid "Connection: %s"
 msgstr "Connectie: %s"
@@ -2772,8 +2778,8 @@ msgstr "Niets nieuw hier"
 msgid "Rate This Channel (this is public)"
 msgstr "Beoordeel dit kanaal (dit is openbaar)"
 
-#: ../../include/js_strings.php:20 ../../mod/connedit.php:700
-#: ../../mod/rate.php:157
+#: ../../include/js_strings.php:20 ../../mod/rate.php:157
+#: ../../mod/connedit.php:703
 msgid "Rating"
 msgstr "Beoordeling"
 
@@ -3046,19 +3052,19 @@ msgctxt "calendar"
 msgid "All day"
 msgstr "hele dag"
 
-#: ../../include/message.php:19
+#: ../../include/message.php:20
 msgid "No recipient provided."
 msgstr "Geen ontvanger opgegeven."
 
-#: ../../include/message.php:24
+#: ../../include/message.php:25
 msgid "[no subject]"
 msgstr "[geen onderwerp]"
 
-#: ../../include/message.php:44
+#: ../../include/message.php:45
 msgid "Unable to determine sender."
 msgstr "Afzender kan niet bepaald worden."
 
-#: ../../include/message.php:219
+#: ../../include/message.php:222
 msgid "Stored post could not be verified."
 msgstr "Opgeslagen bericht kon niet worden geverifieerd."
 
@@ -3172,7 +3178,7 @@ msgstr "Jouw kanaal"
 msgid "Mark all channel notifications seen"
 msgstr "Alle kanaalnotificaties als gelezen markeren"
 
-#: ../../include/nav.php:181 ../../mod/connections.php:260
+#: ../../include/nav.php:181 ../../mod/connections.php:293
 msgid "Connections"
 msgstr "Connecties"
 
@@ -3236,7 +3242,7 @@ msgstr "Beheer je kanalen"
 msgid "Account/Channel Settings"
 msgstr "Account-/kanaal-instellingen"
 
-#: ../../include/nav.php:210 ../../include/widgets.php:1247
+#: ../../include/nav.php:210 ../../include/widgets.php:1279
 msgid "Admin"
 msgstr "Beheer"
 
@@ -3256,7 +3262,7 @@ msgstr "Wachten aub..."
 msgid "view full size"
 msgstr "volledige grootte tonen"
 
-#: ../../include/network.php:1669
+#: ../../include/network.php:1673
 msgid "No Subject"
 msgstr "Geen onderwerp"
 
@@ -3438,7 +3444,7 @@ msgstr "Anders"
 msgid "Custom/Expert Mode"
 msgstr "Expertmodus/handmatig aanpassen"
 
-#: ../../include/photo/photo_driver.php:719 ../../mod/photos.php:94
+#: ../../include/photo/photo_driver.php:722 ../../mod/photos.php:94
 #: ../../mod/photos.php:699 ../../mod/profile_photo.php:147
 #: ../../mod/profile_photo.php:239 ../../mod/profile_photo.php:379
 msgid "Profile Photos"
@@ -3454,6 +3460,7 @@ msgid "Image file is empty."
 msgstr "Afbeeldingsbestand is leeg"
 
 #: ../../include/photos.php:146 ../../mod/profile_photo.php:225
+#: ../../mod/cover_photo.php:164
 msgid "Unable to process image"
 msgstr "Afbeelding kan niet verwerkt worden"
 
@@ -3789,8 +3796,8 @@ msgid "View Connections"
 msgstr "Connecties weergeven"
 
 #: ../../include/text.php:886 ../../include/text.php:898
-#: ../../include/widgets.php:192 ../../mod/admin.php:1528
-#: ../../mod/admin.php:1548 ../../mod/filer.php:49 ../../mod/rbmark.php:28
+#: ../../include/widgets.php:192 ../../mod/admin.php:1568
+#: ../../mod/admin.php:1588 ../../mod/filer.php:49 ../../mod/rbmark.php:28
 #: ../../mod/rbmark.php:100
 msgid "Save"
 msgstr "Opslaan"
@@ -3995,6 +4002,23 @@ msgstr "Lay-outs"
 msgid "Pages"
 msgstr "Pagina's"
 
+#: ../../include/zot.php:676
+msgid "Invalid data packet"
+msgstr "Datapakket ongeldig"
+
+#: ../../include/zot.php:692
+msgid "Unable to verify channel signature"
+msgstr "Kanaalkenmerk kon niet worden geverifieerd.  "
+
+#: ../../include/zot.php:2268
+#, php-format
+msgid "Unable to verify site signature for %s"
+msgstr "Hubkenmerk voor %s kon niet worden geverifieerd"
+
+#: ../../include/zot.php:3584
+msgid "invalid target signature"
+msgstr "ongeldig doelkenmerk"
+
 #: ../../include/widgets.php:93
 msgid "System"
 msgstr "Systeem"
@@ -4011,7 +4035,7 @@ msgstr "Persoonlijke app bewerken"
 msgid "Ignore/Hide"
 msgstr "Negeren/Verbergen"
 
-#: ../../include/widgets.php:144 ../../mod/connections.php:125
+#: ../../include/widgets.php:144
 msgid "Suggestions"
 msgstr "Voorgestelde kanalen"
 
@@ -4029,12 +4053,12 @@ msgid "Add New Connection"
 msgstr "Nieuwe connectie toevoegen"
 
 #: ../../include/widgets.php:173
-msgid "Enter the channel address"
-msgstr "Vul het adres van het nieuwe kanaal in"
+msgid "Enter channel address"
+msgstr "Vul kanaaladres in"
 
 #: ../../include/widgets.php:174
-msgid "Example: bob@example.com, http://example.com/barbara"
-msgstr "Voorbeeld: bob@example.com, http://example.com/barbara"
+msgid "Examples: bob@example.com, https://example.com/barbara"
+msgstr "Voorbeelden: bob@example.com, http://example.com/barbara"
 
 #: ../../include/widgets.php:190
 msgid "Notes"
@@ -4048,20 +4072,20 @@ msgstr "Verwijder zoekterm"
 msgid "Archives"
 msgstr "Archieven"
 
-#: ../../include/widgets.php:428 ../../mod/connedit.php:577
+#: ../../include/widgets.php:428 ../../mod/connedit.php:580
 msgid "Me"
 msgstr "Ik"
 
-#: ../../include/widgets.php:429 ../../mod/connedit.php:578
+#: ../../include/widgets.php:429 ../../mod/connedit.php:581
 msgid "Family"
 msgstr "Familie"
 
-#: ../../include/widgets.php:431 ../../mod/connedit.php:580
+#: ../../include/widgets.php:431 ../../mod/connedit.php:583
 msgid "Acquaintances"
 msgstr "Kennissen"
 
 #: ../../include/widgets.php:432 ../../mod/connections.php:88
-#: ../../mod/connections.php:103 ../../mod/connedit.php:581
+#: ../../mod/connections.php:103 ../../mod/connedit.php:584
 msgid "All"
 msgstr "Alles"
 
@@ -4097,7 +4121,7 @@ msgstr "Verbonden applicaties"
 msgid "Export channel"
 msgstr "Kanaal exporteren"
 
-#: ../../include/widgets.php:533 ../../mod/connedit.php:689
+#: ../../include/widgets.php:533 ../../mod/connedit.php:692
 msgid "Connection Default Permissions"
 msgstr "Standaard permissies voor connecties"
 
@@ -4181,123 +4205,106 @@ msgstr "Bladwijzers van chatkanalen"
 msgid "Suggested Chatrooms"
 msgstr "Voorgestelde chatkanalen"
 
-#: ../../include/widgets.php:931 ../../include/widgets.php:989
+#: ../../include/widgets.php:931 ../../include/widgets.php:1021
 msgid "photo/image"
 msgstr "foto/afbeelding"
 
-#: ../../include/widgets.php:1084 ../../include/widgets.php:1086
+#: ../../include/widgets.php:1116 ../../include/widgets.php:1118
 msgid "Rate Me"
 msgstr "Beoordeel mij"
 
-#: ../../include/widgets.php:1090
+#: ../../include/widgets.php:1122
 msgid "View Ratings"
 msgstr "Bekijk beoordelingen"
 
-#: ../../include/widgets.php:1101
+#: ../../include/widgets.php:1133
 msgid "Public Hubs"
 msgstr "Openbare hubs"
 
-#: ../../include/widgets.php:1149
+#: ../../include/widgets.php:1181
 msgid "Forums"
 msgstr "Forums"
 
-#: ../../include/widgets.php:1178
+#: ../../include/widgets.php:1210
 msgid "Tasks"
 msgstr "Taken"
 
-#: ../../include/widgets.php:1187
+#: ../../include/widgets.php:1219
 msgid "Documentation"
 msgstr "Documentatie"
 
-#: ../../include/widgets.php:1189
+#: ../../include/widgets.php:1221
 msgid "Project/Site Information"
 msgstr "Project- en hub-informatie"
 
-#: ../../include/widgets.php:1190
+#: ../../include/widgets.php:1222
 msgid "For Members"
 msgstr "Voor leden"
 
-#: ../../include/widgets.php:1191
+#: ../../include/widgets.php:1223
 msgid "For Administrators"
 msgstr "Voor beheerders"
 
-#: ../../include/widgets.php:1192
+#: ../../include/widgets.php:1224
 msgid "For Developers"
 msgstr "Voor ontwikkelaars"
 
-#: ../../include/widgets.php:1217 ../../mod/admin.php:452
+#: ../../include/widgets.php:1249 ../../mod/admin.php:452
 msgid "Site"
 msgstr "Hub-instellingen"
 
-#: ../../include/widgets.php:1218
+#: ../../include/widgets.php:1250
 msgid "Accounts"
 msgstr "Accounts"
 
-#: ../../include/widgets.php:1219 ../../mod/admin.php:1051
+#: ../../include/widgets.php:1251 ../../mod/admin.php:1051
 msgid "Channels"
 msgstr "Kanalen"
 
-#: ../../include/widgets.php:1221 ../../mod/admin.php:1148
-#: ../../mod/admin.php:1188
+#: ../../include/widgets.php:1253 ../../mod/admin.php:1166
+#: ../../mod/admin.php:1227
 msgid "Plugins"
 msgstr "Plug-ins"
 
-#: ../../include/widgets.php:1222 ../../mod/admin.php:1348
-#: ../../mod/admin.php:1382
+#: ../../include/widgets.php:1254 ../../mod/admin.php:1388
+#: ../../mod/admin.php:1422
 msgid "Themes"
 msgstr "Thema's"
 
-#: ../../include/widgets.php:1223
+#: ../../include/widgets.php:1255
 msgid "Inspect queue"
 msgstr "Inspecteer berichtenwachtrij"
 
-#: ../../include/widgets.php:1224
+#: ../../include/widgets.php:1256
 msgid "Profile Config"
 msgstr "Profielconfiguratie"
 
-#: ../../include/widgets.php:1225
+#: ../../include/widgets.php:1257
 msgid "DB updates"
 msgstr "Database-updates"
 
-#: ../../include/widgets.php:1243 ../../include/widgets.php:1249
-#: ../../mod/admin.php:1467
+#: ../../include/widgets.php:1275 ../../include/widgets.php:1281
+#: ../../mod/admin.php:1507
 msgid "Logs"
 msgstr "Logboeken"
 
-#: ../../include/widgets.php:1248
+#: ../../include/widgets.php:1280
 msgid "Plugin Features"
 msgstr "Plug-in-opties"
 
-#: ../../include/widgets.php:1250
+#: ../../include/widgets.php:1282
 msgid "User registrations waiting for confirmation"
 msgstr "Accounts die op goedkeuring wachten"
 
-#: ../../include/widgets.php:1328 ../../mod/photos.php:748
+#: ../../include/widgets.php:1360 ../../mod/photos.php:748
 #: ../../mod/photos.php:1283
 msgid "View Photo"
 msgstr "Foto weergeven"
 
-#: ../../include/widgets.php:1345 ../../mod/photos.php:779
+#: ../../include/widgets.php:1377 ../../mod/photos.php:779
 msgid "Edit Album"
 msgstr "Album bewerken"
 
-#: ../../include/zot.php:676
-msgid "Invalid data packet"
-msgstr "Datapakket ongeldig"
-
-#: ../../include/zot.php:692
-msgid "Unable to verify channel signature"
-msgstr "Kanaalkenmerk kon niet worden geverifieerd.  "
-
-#: ../../include/zot.php:2268
-#, php-format
-msgid "Unable to verify site signature for %s"
-msgstr "Hubkenmerk voor %s kon niet worden geverifieerd"
-
-#: ../../include/zot.php:3584
-msgid "invalid target signature"
-msgstr "ongeldig doelkenmerk"
-
 #: ../../index.php:238 ../../mod/help.php:213
 msgid "Not Found"
 msgstr "Niet gevonden"
@@ -4356,9 +4363,9 @@ msgid "Message queues"
 msgstr "Berichtenwachtrij"
 
 #: ../../mod/admin.php:206 ../../mod/admin.php:451 ../../mod/admin.php:619
-#: ../../mod/admin.php:886 ../../mod/admin.php:1050 ../../mod/admin.php:1147
-#: ../../mod/admin.php:1187 ../../mod/admin.php:1347 ../../mod/admin.php:1381
-#: ../../mod/admin.php:1466
+#: ../../mod/admin.php:886 ../../mod/admin.php:1050 ../../mod/admin.php:1165
+#: ../../mod/admin.php:1226 ../../mod/admin.php:1387 ../../mod/admin.php:1421
+#: ../../mod/admin.php:1506
 msgid "Administration"
 msgstr "Beheer"
 
@@ -4422,7 +4429,7 @@ msgstr "Mijn $Projectname-hub kent alleen gratis toegang"
 msgid "My site offers free accounts with optional paid upgrades"
 msgstr "Mijn $Projectname-hub biedt gratis accounts aan met betaalde uitbreidingen als optie"
 
-#: ../../mod/admin.php:454 ../../mod/register.php:209
+#: ../../mod/admin.php:454 ../../mod/register.php:237
 msgid "Registration"
 msgstr "Registratie"
 
@@ -4695,7 +4702,7 @@ msgstr "Maximale systeembelasting voordat de afleverings- en polllingsprocessen
 
 #: ../../mod/admin.php:495
 msgid "Expiration period in days for imported (matrix/network) content"
-msgstr "Aantal dagen waarna geïmporteerde inhoud uit iemands matrix/netwerk-pagina wordt verwijderd."
+msgstr "Aantal dagen waarna geïmporteerde inhoud uit iemands grid/netwerk-pagina wordt verwijderd."
 
 #: ../../mod/admin.php:495
 msgid "0 for no expiration of imported content"
@@ -4734,7 +4741,7 @@ msgstr "voor kanaal"
 msgid "on server"
 msgstr "op hub"
 
-#: ../../mod/admin.php:618
+#: ../../mod/admin.php:618 ../../mod/connections.php:267
 msgid "Status"
 msgstr "Status"
 
@@ -4863,7 +4870,7 @@ msgstr "Tijd/datum verzoek"
 msgid "No registrations."
 msgstr "Geen verzoeken."
 
-#: ../../mod/admin.php:893 ../../mod/connedit.php:716
+#: ../../mod/admin.php:893 ../../mod/connedit.php:719
 msgid "Approve"
 msgstr "Goedkeuren"
 
@@ -4871,11 +4878,11 @@ msgstr "Goedkeuren"
 msgid "Deny"
 msgstr "Afkeuren"
 
-#: ../../mod/admin.php:896 ../../mod/connedit.php:525
+#: ../../mod/admin.php:896 ../../mod/connedit.php:528
 msgid "Block"
 msgstr "Blokkeren"
 
-#: ../../mod/admin.php:897 ../../mod/connedit.php:525
+#: ../../mod/admin.php:897 ../../mod/connedit.php:528
 msgid "Unblock"
 msgstr "Deblokkeren"
 
@@ -4993,114 +5000,130 @@ msgid ""
 "channel on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Kanaal {0} wordt verwijderd!\\n\\nAlles wat in dit kanaal op deze hub werd gepubliceerd wordt definitief verwijderd!\\n\\nWeet je het zeker?"
 
-#: ../../mod/admin.php:1103
+#: ../../mod/admin.php:1120
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "Plug-in %s uitgeschakeld."
 
-#: ../../mod/admin.php:1107
+#: ../../mod/admin.php:1124
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "Plug-in %s ingeschakeld"
 
-#: ../../mod/admin.php:1117 ../../mod/admin.php:1320
+#: ../../mod/admin.php:1134 ../../mod/admin.php:1360
 msgid "Disable"
 msgstr "Uitschakelen"
 
-#: ../../mod/admin.php:1120 ../../mod/admin.php:1322
+#: ../../mod/admin.php:1137 ../../mod/admin.php:1362
 msgid "Enable"
 msgstr "Inschakelen"
 
-#: ../../mod/admin.php:1149 ../../mod/admin.php:1349
+#: ../../mod/admin.php:1167 ../../mod/admin.php:1389
 msgid "Toggle"
 msgstr "Omschakelen"
 
-#: ../../mod/admin.php:1157 ../../mod/admin.php:1359
+#: ../../mod/admin.php:1175 ../../mod/admin.php:1399
 msgid "Author: "
 msgstr "Auteur: "
 
-#: ../../mod/admin.php:1158 ../../mod/admin.php:1360
+#: ../../mod/admin.php:1176 ../../mod/admin.php:1400
 msgid "Maintainer: "
 msgstr "Beheerder: "
 
-#: ../../mod/admin.php:1285
+#: ../../mod/admin.php:1177
+msgid "Minimum project version: "
+msgstr "Minimum versie Hubzilla: "
+
+#: ../../mod/admin.php:1178
+msgid "Maximum project version: "
+msgstr "Maximum versie Hubzilla:"
+
+#: ../../mod/admin.php:1179
+msgid "Minimum PHP version: "
+msgstr "Minimum versie PHP: "
+
+#: ../../mod/admin.php:1181 ../../mod/admin.php:1232
+msgid "Disabled - version incompatibility"
+msgstr "Uitgeschakeld - versie is incompatibel"
+
+#: ../../mod/admin.php:1325
 msgid "No themes found."
 msgstr "Geen thema's gevonden"
 
-#: ../../mod/admin.php:1341
+#: ../../mod/admin.php:1381
 msgid "Screenshot"
 msgstr "Schermafdruk"
 
-#: ../../mod/admin.php:1387
+#: ../../mod/admin.php:1427
 msgid "[Experimental]"
 msgstr "[Experimenteel]"
 
-#: ../../mod/admin.php:1388
+#: ../../mod/admin.php:1428
 msgid "[Unsupported]"
 msgstr "[Niet ondersteund]"
 
-#: ../../mod/admin.php:1412
+#: ../../mod/admin.php:1452
 msgid "Log settings updated."
 msgstr "Logboek-instellingen bijgewerkt."
 
-#: ../../mod/admin.php:1469
+#: ../../mod/admin.php:1509
 msgid "Clear"
 msgstr "Leegmaken"
 
-#: ../../mod/admin.php:1475
+#: ../../mod/admin.php:1515
 msgid "Debugging"
 msgstr "Debuggen"
 
-#: ../../mod/admin.php:1476
+#: ../../mod/admin.php:1516
 msgid "Log file"
 msgstr "Logbestand"
 
-#: ../../mod/admin.php:1476
+#: ../../mod/admin.php:1516
 msgid ""
 "Must be writable by web server. Relative to your Red top-level directory."
 msgstr "Moet door de webserver beschrijfbaar zijn. Relatief ten opzichte van de bovenste map van je $Projectname-installatie."
 
-#: ../../mod/admin.php:1477
+#: ../../mod/admin.php:1517
 msgid "Log level"
 msgstr "Logniveau"
 
-#: ../../mod/admin.php:1523
+#: ../../mod/admin.php:1563
 msgid "New Profile Field"
 msgstr "Nieuw profielveld"
 
-#: ../../mod/admin.php:1524 ../../mod/admin.php:1544
+#: ../../mod/admin.php:1564 ../../mod/admin.php:1584
 msgid "Field nickname"
 msgstr "Bijnaam voor veld"
 
-#: ../../mod/admin.php:1524 ../../mod/admin.php:1544
+#: ../../mod/admin.php:1564 ../../mod/admin.php:1584
 msgid "System name of field"
 msgstr "Systeemnaam voor veld"
 
-#: ../../mod/admin.php:1525 ../../mod/admin.php:1545
+#: ../../mod/admin.php:1565 ../../mod/admin.php:1585
 msgid "Input type"
 msgstr "Invoertype"
 
-#: ../../mod/admin.php:1526 ../../mod/admin.php:1546
+#: ../../mod/admin.php:1566 ../../mod/admin.php:1586
 msgid "Field Name"
 msgstr "Veldnaam"
 
-#: ../../mod/admin.php:1526 ../../mod/admin.php:1546
+#: ../../mod/admin.php:1566 ../../mod/admin.php:1586
 msgid "Label on profile pages"
 msgstr "Tekstlabel voor op profielpagina's"
 
-#: ../../mod/admin.php:1527 ../../mod/admin.php:1547
+#: ../../mod/admin.php:1567 ../../mod/admin.php:1587
 msgid "Help text"
 msgstr "Helptekst"
 
-#: ../../mod/admin.php:1527 ../../mod/admin.php:1547
+#: ../../mod/admin.php:1567 ../../mod/admin.php:1587
 msgid "Additional info (optional)"
 msgstr "Extra informatie (optioneel)"
 
-#: ../../mod/admin.php:1537
+#: ../../mod/admin.php:1577
 msgid "Field definition not found"
 msgstr "Velddefinitie niet gevonden"
 
-#: ../../mod/admin.php:1543
+#: ../../mod/admin.php:1583
 msgid "Edit Profile Field"
 msgstr "Profielveld bewerken"
 
@@ -5322,340 +5345,86 @@ msgstr "(Er zijn geen speciale voorwaarden en aanwijzingen door de kanaal-eigena
 msgid "Restricted or Premium Channel"
 msgstr "Beperkt of premiumkanaal"
 
-#: ../../mod/connections.php:52 ../../mod/connections.php:150
+#: ../../mod/connections.php:52 ../../mod/connections.php:157
+#: ../../mod/connections.php:238
 msgid "Blocked"
 msgstr "Geblokkeerd"
 
-#: ../../mod/connections.php:57 ../../mod/connections.php:157
+#: ../../mod/connections.php:57 ../../mod/connections.php:164
+#: ../../mod/connections.php:237
 msgid "Ignored"
 msgstr "Genegeerd"
 
-#: ../../mod/connections.php:62 ../../mod/connections.php:171
+#: ../../mod/connections.php:62 ../../mod/connections.php:178
+#: ../../mod/connections.php:236
 msgid "Hidden"
 msgstr "Verborgen"
 
-#: ../../mod/connections.php:67 ../../mod/connections.php:164
+#: ../../mod/connections.php:67 ../../mod/connections.php:171
+#: ../../mod/connections.php:235
 msgid "Archived"
 msgstr "Gearchiveerd"
 
-#: ../../mod/connections.php:128
-msgid "Suggest new connections"
-msgstr "Nieuwe kanalen voorstellen"
-
-#: ../../mod/connections.php:131
+#: ../../mod/connections.php:134
 msgid "New Connections"
 msgstr "Nieuwe connecties"
 
-#: ../../mod/connections.php:134
+#: ../../mod/connections.php:137
 msgid "Show pending (new) connections"
 msgstr "Nog te accepteren (nieuwe) connecties weergeven"
 
-#: ../../mod/connections.php:137 ../../mod/profperm.php:139
+#: ../../mod/connections.php:141 ../../mod/profperm.php:139
 msgid "All Connections"
 msgstr "Alle connecties"
 
-#: ../../mod/connections.php:140
+#: ../../mod/connections.php:144
 msgid "Show all connections"
 msgstr "Toon alle connecties"
 
-#: ../../mod/connections.php:143
-msgid "Unblocked"
-msgstr "Niet geblokkeerd"
-
-#: ../../mod/connections.php:146
-msgid "Only show unblocked connections"
-msgstr "Toon alleen niet geblokkeerde connecties"
-
-#: ../../mod/connections.php:153
+#: ../../mod/connections.php:160
 msgid "Only show blocked connections"
 msgstr "Toon alleen geblokkeerde connecties"
 
-#: ../../mod/connections.php:160
+#: ../../mod/connections.php:167
 msgid "Only show ignored connections"
 msgstr "Toon alleen genegeerde connecties"
 
-#: ../../mod/connections.php:167
+#: ../../mod/connections.php:174
 msgid "Only show archived connections"
 msgstr "Toon alleen gearchiveerde connecties"
 
-#: ../../mod/connections.php:174
+#: ../../mod/connections.php:181
 msgid "Only show hidden connections"
 msgstr "Toon alleen verborgen connecties"
 
-#: ../../mod/connections.php:225
+#: ../../mod/connections.php:234
+msgid "Pending"
+msgstr "Nog niet goedgekeurd"
+
+#: ../../mod/connections.php:250
 #, php-format
 msgid "%1$s [%2$s]"
 msgstr "%1$s [%2$s]"
 
-#: ../../mod/connections.php:226
+#: ../../mod/connections.php:251
 msgid "Edit connection"
 msgstr "Connectie bewerken"
 
-#: ../../mod/connections.php:264
-msgid "Search your connections"
-msgstr "Doorzoek jouw connecties"
-
-#: ../../mod/connections.php:265
-msgid "Finding: "
-msgstr "Zoeken naar: "
-
-#: ../../mod/connedit.php:75
-msgid "Could not access contact record."
-msgstr "Kon geen toegang krijgen tot de connectie-gegevens."
-
-#: ../../mod/connedit.php:99
-msgid "Could not locate selected profile."
-msgstr "Kon het gekozen profiel niet vinden."
-
-#: ../../mod/connedit.php:223
-msgid "Connection updated."
-msgstr "Connectie bijgewerkt."
-
-#: ../../mod/connedit.php:225
-msgid "Failed to update connection record."
-msgstr "Bijwerken van connectie-gegevens mislukt."
-
-#: ../../mod/connedit.php:272
-msgid "is now connected to"
-msgstr "is nu verbonden met"
-
-#: ../../mod/connedit.php:395
-msgid "Could not access address book record."
-msgstr "Kon geen toegang krijgen tot de record van de connectie."
-
-#: ../../mod/connedit.php:409
-msgid "Refresh failed - channel is currently unavailable."
-msgstr "Vernieuwen mislukt - kanaal is momenteel niet beschikbaar"
-
-#: ../../mod/connedit.php:424 ../../mod/connedit.php:433
-#: ../../mod/connedit.php:442 ../../mod/connedit.php:451
-#: ../../mod/connedit.php:464
-msgid "Unable to set address book parameters."
-msgstr "Niet in staat om de parameters van connecties in te stellen."
-
-#: ../../mod/connedit.php:488
-msgid "Connection has been removed."
-msgstr "Connectie is verwijderd"
-
-#: ../../mod/connedit.php:507
-#, php-format
-msgid "View %s's profile"
-msgstr "Profiel van %s weergeven"
-
-#: ../../mod/connedit.php:511
-msgid "Refresh Permissions"
-msgstr "Permissies vernieuwen"
-
-#: ../../mod/connedit.php:514
-msgid "Fetch updated permissions"
-msgstr "Aangepaste permissies ophalen"
-
-#: ../../mod/connedit.php:518
-msgid "Recent Activity"
-msgstr "Kanaal-activiteit"
-
-#: ../../mod/connedit.php:521
-msgid "View recent posts and comments"
-msgstr "Recente berichten en reacties weergeven"
-
-#: ../../mod/connedit.php:528
-msgid "Block (or Unblock) all communications with this connection"
-msgstr "Blokkeer (of deblokkeer) alle communicatie met deze connectie"
-
-#: ../../mod/connedit.php:529
-msgid "This connection is blocked!"
-msgstr "Deze connectie is geblokkeerd!"
-
-#: ../../mod/connedit.php:533
-msgid "Unignore"
-msgstr "Niet meer negeren"
-
-#: ../../mod/connedit.php:533 ../../mod/notifications.php:51
-msgid "Ignore"
-msgstr "Negeren"
-
-#: ../../mod/connedit.php:536
-msgid "Ignore (or Unignore) all inbound communications from this connection"
-msgstr "Negeer (of negeer niet meer) alle inkomende communicatie van deze connectie"
-
-#: ../../mod/connedit.php:537
-msgid "This connection is ignored!"
-msgstr "Deze connectie wordt genegeerd!"
-
-#: ../../mod/connedit.php:541
-msgid "Unarchive"
-msgstr "Niet meer archiveren"
-
-#: ../../mod/connedit.php:541
-msgid "Archive"
-msgstr "Archiveren"
-
-#: ../../mod/connedit.php:544
-msgid ""
-"Archive (or Unarchive) this connection - mark channel dead but keep content"
-msgstr "Archiveer (of dearchiveer) deze connectie - markeer het kanaal als dood, maar bewaar de inhoud"
-
-#: ../../mod/connedit.php:545
-msgid "This connection is archived!"
-msgstr "Deze connectie is gearchiveerd!"
-
-#: ../../mod/connedit.php:549
-msgid "Unhide"
-msgstr "Niet meer verbergen"
-
-#: ../../mod/connedit.php:549
-msgid "Hide"
-msgstr "Verbergen"
-
-#: ../../mod/connedit.php:552
-msgid "Hide or Unhide this connection from your other connections"
-msgstr "Deze connectie verbergen (of niet meer verbergen) voor jouw andere connecties"
-
-#: ../../mod/connedit.php:553
-msgid "This connection is hidden!"
-msgstr "Deze connectie is verborgen!"
-
-#: ../../mod/connedit.php:560
-msgid "Delete this connection"
-msgstr "Deze connectie verwijderen"
-
-#: ../../mod/connedit.php:641
-msgid "Approve this connection"
-msgstr "Deze connectie accepteren"
-
-#: ../../mod/connedit.php:641
-msgid "Accept connection to allow communication"
-msgstr "Keur deze connectie goed om communicatie toe te staan"
-
-#: ../../mod/connedit.php:646
-msgid "Set Affinity"
-msgstr "Verwantschapsfilter instellen"
-
-#: ../../mod/connedit.php:649
-msgid "Set Profile"
-msgstr "Profiel instellen"
-
-#: ../../mod/connedit.php:652
-msgid "Set Affinity & Profile"
-msgstr "Verwantschapsfilter en profiel instellen"
-
-#: ../../mod/connedit.php:685
-msgid "none"
-msgstr "geen"
+#: ../../mod/connections.php:252
+msgid "Delete connection"
+msgstr "Connectie verwijderen"
 
-#: ../../mod/connedit.php:690
-msgid "Apply these permissions automatically"
-msgstr "Deze permissies automatisch toepassen"
-
-#: ../../mod/connedit.php:692
-msgid "This connection's primary address is"
-msgstr "Het primaire kanaaladres van deze connectie is"
-
-#: ../../mod/connedit.php:693
-msgid "Available locations:"
-msgstr "Beschikbare locaties:"
-
-#: ../../mod/connedit.php:697
-msgid ""
-"The permissions indicated on this page will be applied to all new "
-"connections."
-msgstr "Permissies die op deze pagina staan vermeld worden op alle nieuwe connecties toegepast."
-
-#: ../../mod/connedit.php:699
-msgid "Slide to adjust your degree of friendship"
-msgstr "Schuif om te bepalen hoe goed je iemand kent en/of mag"
-
-#: ../../mod/connedit.php:701
-msgid "Slide to adjust your rating"
-msgstr "Gebruik de schuif om je beoordeling te geven"
-
-#: ../../mod/connedit.php:702 ../../mod/connedit.php:707
-msgid "Optionally explain your rating"
-msgstr "Verklaar jouw beoordeling (niet verplicht)"
-
-#: ../../mod/connedit.php:704
-msgid "Custom Filter"
-msgstr "Berichtenfilter"
-
-#: ../../mod/connedit.php:705
-msgid "Only import posts with this text"
-msgstr "Importeer alleen berichten met deze tekst"
-
-#: ../../mod/connedit.php:705 ../../mod/connedit.php:706
-msgid ""
-"words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
-"all posts"
-msgstr "woorden (één per regel), #tags, /regex/ of talen (lang=iso639-1)  - laat leeg om alle berichten te importeren"
-
-#: ../../mod/connedit.php:706
-msgid "Do not import posts with this text"
-msgstr "Importeer geen berichten met deze tekst"
-
-#: ../../mod/connedit.php:708
-msgid "This information is public!"
-msgstr "Deze informatie is openbaar!"
-
-#: ../../mod/connedit.php:713
-msgid "Connection Pending Approval"
-msgstr "Connectie moet nog goedgekeurd worden"
-
-#: ../../mod/connedit.php:714
-msgid "Connection Request"
-msgstr "Connectieverzoek"
-
-#: ../../mod/connedit.php:715
-#, php-format
-msgid ""
-"(%s) would like to connect with you. Please approve this connection to allow"
-" communication."
-msgstr "(%s) wil met jou verbinden. Keur dit connectieverzoek goed om onderling te kunnen communiceren."
-
-#: ../../mod/connedit.php:717
-msgid "Approve Later"
-msgstr "Later goedkeuren"
-
-#: ../../mod/connedit.php:720
-msgid "inherited"
-msgstr "geërfd"
-
-#: ../../mod/connedit.php:722
-#, php-format
-msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
-msgstr "Kies het profiel dat je aan %s wil tonen wanneer hij/zij ingelogd jouw profiel wil bekijken."
-
-#: ../../mod/connedit.php:724
-msgid "Their Settings"
-msgstr "Hun instellingen"
+#: ../../mod/connections.php:269
+msgid "Connected"
+msgstr "Verbonden"
 
-#: ../../mod/connedit.php:725
-msgid "My Settings"
-msgstr "Mijn instellingen"
-
-#: ../../mod/connedit.php:727
-msgid "Individual Permissions"
-msgstr "Individuele permissies"
-
-#: ../../mod/connedit.php:728
-msgid ""
-"Some permissions may be inherited from your channel's <a "
-"href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
-"priority than individual settings. You can <strong>not</strong> change those"
-" settings here."
-msgstr "Sommige permissies worden mogelijk overgeërfd van de <a href=\"settings\">privacy-instellingen</a> van jouw kanaal, die een hogere prioriteit hebben dan deze individuele instellingen. Je kan je deze overgeërfde permissies hier <strong>niet</strong> veranderen."
-
-#: ../../mod/connedit.php:729
-msgid ""
-"Some permissions may be inherited from your channel's <a "
-"href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
-"priority than individual settings. You can change those settings here but "
-"they wont have any impact unless the inherited setting changes."
-msgstr "Sommige permissies worden mogelijk overgeërfd van de <a href=\"settings\">privacy-instellingen</a> van jouw kanaal, die een hogere prioriteit hebben dan deze individuele permissies. Je kan de permissies hier veranderen, maar die hebben geen effect, tenzij de overgeërfde permissies worden veranderd. "
+#: ../../mod/connections.php:298
+msgid "Search your connections"
+msgstr "Doorzoek jouw connecties"
 
-#: ../../mod/connedit.php:730
-msgid "Last update:"
-msgstr "Laatste wijziging:"
+#: ../../mod/connections.php:299
+msgid "Connections search"
+msgstr "Connecties zoeken"
 
 #: ../../mod/dav.php:121
 msgid "$Projectname channel"
@@ -6389,7 +6158,7 @@ msgstr "Jouw bericht:"
 
 #: ../../mod/invite.php:132
 msgid "Please join my community on $Projectname."
-msgstr "Hierbij nodig ik je uit om mij, en andere vrienden en kennissen, op $Projectname te vergezellen. Lees meer over $Projectname  op https://redmatrix.me."
+msgstr "Hierbij nodig ik je uit om mij, en andere vrienden en kennissen, op $Projectname te vergezellen. Lees meer over $Projectname  op http://hubzilla.org"
 
 #: ../../mod/invite.php:134
 msgid "You will need to supply this invitation code: "
@@ -7057,8 +6826,8 @@ msgid ""
 "service provider allows."
 msgstr "Naast een account moet je tenminste één kanaal aanmaken. Een kanaal is een persoonlijke verzameling (gerelateerde) berichten en media, zoals je misschien gewend bent van sociale netwerken. Een kanaal kan gebruikt worden voor social media, een blog, forum, en voor veel meer. Je kan net zoveel kanalen aanmaken als dat de eigenaar/beheerder van jouw hub toestaat."
 
-#: ../../mod/new_channel.php:123 ../../mod/sources.php:103
-#: ../../mod/sources.php:137
+#: ../../mod/new_channel.php:123 ../../mod/register.php:246
+#: ../../mod/sources.php:103 ../../mod/sources.php:137
 msgid "Channel Name"
 msgstr "Kanaalnaam"
 
@@ -7066,11 +6835,11 @@ msgstr "Kanaalnaam"
 msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "
 msgstr "Jouw naam of een andere relevante naam. Voorbeelden: \"Jan Pietersen\", \"Willems weblog\", \"Familieforum\""
 
-#: ../../mod/new_channel.php:125
+#: ../../mod/new_channel.php:125 ../../mod/register.php:248
 msgid "Choose a short nickname"
 msgstr "Korte bijnaam"
 
-#: ../../mod/new_channel.php:126
+#: ../../mod/new_channel.php:126 ../../mod/register.php:249
 msgid ""
 "Your nickname will be used to create an easily remembered channel address "
 "(like an email address) which you can share with others."
@@ -7080,17 +6849,17 @@ msgstr "Deze bijnaam (geen spaties) wordt gebruikt om een makkelijk te onthouden
 msgid "Or <a href=\"import\">import an existing channel</a> from another location"
 msgstr "Of <a href=\"import\">importeer een bestaand kanaal</a> vanaf een andere locatie."
 
-#: ../../mod/new_channel.php:129
+#: ../../mod/new_channel.php:129 ../../mod/register.php:251
 msgid ""
 "Please choose a channel type (such as social networking or community forum) "
 "and privacy requirements so we can select the best permissions for you"
 msgstr "Kies een kanaaltype en het door jouw gewenste privacy-niveau, zodat  automatisch de beste permissies kunnen worden ingesteld. Dit kan later, indien gewenst, worden veranderd."
 
-#: ../../mod/new_channel.php:130
+#: ../../mod/new_channel.php:130 ../../mod/register.php:252
 msgid "Channel Type"
 msgstr "Kanaaltype"
 
-#: ../../mod/new_channel.php:130
+#: ../../mod/new_channel.php:130 ../../mod/register.php:252
 msgid "Read more about roles"
 msgstr "Lees meer over kanaaltypes"
 
@@ -7102,6 +6871,10 @@ msgstr "Ongeldige verzoek identificator (request identifier)"
 msgid "Discard"
 msgstr "Annuleren"
 
+#: ../../mod/notifications.php:51 ../../mod/connedit.php:536
+msgid "Ignore"
+msgstr "Negeren"
+
 #: ../../mod/notifications.php:94 ../../mod/notify.php:53
 msgid "No more system notifications."
 msgstr "Geen systeemnotificaties meer."
@@ -7356,11 +7129,11 @@ msgstr "Maak dit bericht privé"
 msgid "Fetching URL returns error: %1$s"
 msgstr "Ophalen URL gaf een foutmelding terug: %1$s"
 
-#: ../../mod/profile_photo.php:112
+#: ../../mod/profile_photo.php:112 ../../mod/cover_photo.php:54
 msgid "Image uploaded but image cropping failed."
 msgstr "Afbeelding geüpload, maar afbeelding kon niet worden bijgesneden. "
 
-#: ../../mod/profile_photo.php:166
+#: ../../mod/profile_photo.php:166 ../../mod/cover_photo.php:150
 msgid "Image resize failed."
 msgstr "Afbeelding kon niet van grootte veranderd worden."
 
@@ -7370,33 +7143,33 @@ msgid ""
 "display immediately."
 msgstr "Vernieuw de pagina met shift+R of shift+F5, of leeg je browserbuffer, wanneer de nieuwe foto niet meteen wordt weergegeven."
 
-#: ../../mod/profile_photo.php:250
+#: ../../mod/profile_photo.php:250 ../../mod/cover_photo.php:188
 msgid "Image upload failed."
 msgstr "Uploaden afbeelding mislukt"
 
-#: ../../mod/profile_photo.php:269
+#: ../../mod/profile_photo.php:269 ../../mod/cover_photo.php:206
 msgid "Unable to process image."
 msgstr "Niet in staat om afbeelding te verwerken."
 
-#: ../../mod/profile_photo.php:297
+#: ../../mod/profile_photo.php:297 ../../mod/cover_photo.php:229
 msgid "female"
 msgstr "vrouw"
 
-#: ../../mod/profile_photo.php:298
+#: ../../mod/profile_photo.php:298 ../../mod/cover_photo.php:230
 #, php-format
 msgid "%1$s updated her %2$s"
 msgstr "%1$s heeft haar %2$s bijgewerkt"
 
-#: ../../mod/profile_photo.php:299
+#: ../../mod/profile_photo.php:299 ../../mod/cover_photo.php:231
 msgid "male"
 msgstr "man"
 
-#: ../../mod/profile_photo.php:300
+#: ../../mod/profile_photo.php:300 ../../mod/cover_photo.php:232
 #, php-format
 msgid "%1$s updated his %2$s"
 msgstr "%1$s heeft zijn %2$s bijgewerkt"
 
-#: ../../mod/profile_photo.php:302
+#: ../../mod/profile_photo.php:302 ../../mod/cover_photo.php:234
 #, php-format
 msgid "%1$s updated their %2$s"
 msgstr "%1$s hebben hun %2$s bijgewerkt"
@@ -7406,14 +7179,15 @@ msgid "profile photo"
 msgstr "profielfoto"
 
 #: ../../mod/profile_photo.php:368 ../../mod/profile_photo.php:409
+#: ../../mod/cover_photo.php:299 ../../mod/cover_photo.php:314
 msgid "Photo not available."
 msgstr "Foto niet beschikbaar."
 
-#: ../../mod/profile_photo.php:450
+#: ../../mod/profile_photo.php:450 ../../mod/cover_photo.php:350
 msgid "Upload File:"
 msgstr "Bestand uploaden:"
 
-#: ../../mod/profile_photo.php:451
+#: ../../mod/profile_photo.php:451 ../../mod/cover_photo.php:351
 msgid "Select a profile:"
 msgstr "Kies een profiel:"
 
@@ -7422,26 +7196,27 @@ msgid "Upload Profile Photo"
 msgstr "Profielfoto uploaden"
 
 #: ../../mod/profile_photo.php:457 ../../mod/settings.php:975
+#: ../../mod/cover_photo.php:357
 msgid "or"
 msgstr "of"
 
-#: ../../mod/profile_photo.php:457
+#: ../../mod/profile_photo.php:457 ../../mod/cover_photo.php:357
 msgid "skip this step"
 msgstr "sla deze stap over"
 
-#: ../../mod/profile_photo.php:457
+#: ../../mod/profile_photo.php:457 ../../mod/cover_photo.php:357
 msgid "select a photo from your photo albums"
 msgstr "Kies een foto uit jouw fotoalbums"
 
-#: ../../mod/profile_photo.php:473
+#: ../../mod/profile_photo.php:473 ../../mod/cover_photo.php:373
 msgid "Crop Image"
 msgstr "Afbeelding bijsnijden"
 
-#: ../../mod/profile_photo.php:474
+#: ../../mod/profile_photo.php:474 ../../mod/cover_photo.php:374
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr "Snij de afbeelding zo uit dat deze optimaal wordt weergegeven."
 
-#: ../../mod/profile_photo.php:476
+#: ../../mod/profile_photo.php:476 ../../mod/cover_photo.php:376
 msgid "Done Editing"
 msgstr "Klaar met bewerken"
 
@@ -7808,78 +7583,86 @@ msgstr "URL van bladwijzer"
 msgid "Or enter new bookmark folder name"
 msgstr "Of geef de naam op van een nieuwe bladwijzermap"
 
-#: ../../mod/register.php:44
+#: ../../mod/register.php:45
 msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
 msgstr "Maximum toegestane dagelijkse registraties op deze $Projectname-hub bereikt. Probeer het morgen (UTC) nogmaals."
 
-#: ../../mod/register.php:50
+#: ../../mod/register.php:51
 msgid ""
 "Please indicate acceptance of the Terms of Service. Registration failed."
 msgstr "Registratie mislukt. De gebruiksvoorwaarden dienen wel geaccepteerd te worden."
 
-#: ../../mod/register.php:84
+#: ../../mod/register.php:85
 msgid "Passwords do not match."
 msgstr "Wachtwoorden komen niet met elkaar overeen."
 
-#: ../../mod/register.php:119
+#: ../../mod/register.php:127
 msgid ""
 "Registration successful. Please check your email for validation "
 "instructions."
 msgstr "Registratie geslaagd. Controleer je e-mail voor instructies."
 
-#: ../../mod/register.php:125
+#: ../../mod/register.php:133
 msgid "Your registration is pending approval by the site owner."
 msgstr "Jouw accountregistratie wacht op goedkeuring van de beheerder van deze $Projectname-hub."
 
-#: ../../mod/register.php:128
+#: ../../mod/register.php:136
 msgid "Your registration can not be processed."
 msgstr "Jouw registratie kan niet verwerkt worden."
 
-#: ../../mod/register.php:165
+#: ../../mod/register.php:179
+msgid "Registration on this site is disabled."
+msgstr "Registreren van nieuwe accounts is op deze hub uitgeschakeld."
+
+#: ../../mod/register.php:188
 msgid "Registration on this site/hub is by approval only."
 msgstr "Registraties op deze $Projectname-hub moeten eerst worden goedgekeurd."
 
-#: ../../mod/register.php:166
+#: ../../mod/register.php:189
 msgid "<a href=\"pubsites\">Register at another affiliated site/hub</a>"
 msgstr "<a href=\"pubsites\">Registreer op een andere $Projectname-hub</a>"
 
-#: ../../mod/register.php:176
+#: ../../mod/register.php:199
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
 msgstr "Deze $Projectname-hub heeft het maximum aantal dagelijks toegestane registraties bereikt. Probeer het morgen (UTC) nogmaals."
 
-#: ../../mod/register.php:187
+#: ../../mod/register.php:210
 msgid "Terms of Service"
 msgstr "Gebruiksvoorwaarden"
 
-#: ../../mod/register.php:193
+#: ../../mod/register.php:216
 #, php-format
 msgid "I accept the %s for this website"
 msgstr "Ik accepteer de %s van deze $Projectname-hub"
 
-#: ../../mod/register.php:195
+#: ../../mod/register.php:218
 #, php-format
 msgid "I am over 13 years of age and accept the %s for this website"
 msgstr "Ik accepteer de %s van deze $Projectname-hub"
 
-#: ../../mod/register.php:214
+#: ../../mod/register.php:242
 msgid "Membership on this site is by invitation only."
 msgstr "Registreren op deze $Projectname-hub kan alleen op uitnodiging."
 
-#: ../../mod/register.php:215
+#: ../../mod/register.php:243
 msgid "Please enter your invitation code"
 msgstr "Vul jouw uitnodigingscode in"
 
-#: ../../mod/register.php:218
+#: ../../mod/register.php:247
+msgid "Enter your name"
+msgstr "Vul jouw naam in"
+
+#: ../../mod/register.php:256
 msgid "Your email address"
 msgstr "Jouw e-mailadres"
 
-#: ../../mod/register.php:219
+#: ../../mod/register.php:257
 msgid "Choose a password"
 msgstr "Geef een wachtwoord op"
 
-#: ../../mod/register.php:220
+#: ../../mod/register.php:258
 msgid "Please re-enter your password"
 msgstr "Geef het wachtwoord opnieuw op"
 
@@ -8213,7 +7996,7 @@ msgstr "(reacties worden afzonderlijk weergeven)"
 
 #: ../../mod/settings.php:849
 msgid "Use blog/list mode on matrix page"
-msgstr "Gebruik blog/lijst-modus op matrixpagina"
+msgstr "Gebruik blog/lijst-modus op gridpagina"
 
 #: ../../mod/settings.php:850
 msgid "Channel page max height of content (in pixels)"
@@ -8225,7 +8008,7 @@ msgstr "klik om inhoud uit te klappen die deze hoogte overschrijdt"
 
 #: ../../mod/settings.php:851
 msgid "Matrix page max height of content (in pixels)"
-msgstr "Maximale hoogte berichtinhoud op matrixpagina (in pixels)"
+msgstr "Maximale hoogte berichtinhoud op gridpagina (in pixels)"
 
 #: ../../mod/settings.php:885
 msgid "Nobody except yourself"
@@ -8451,7 +8234,7 @@ msgstr "Toon de volgende zichtbare notificaties:"
 
 #: ../../mod/settings.php:1087
 msgid "Unseen matrix activity"
-msgstr "Niet bekeken matrix-activiteit"
+msgstr "Niet bekeken grid-activiteit"
 
 #: ../../mod/settings.php:1088
 msgid "Unseen channel activity"
@@ -8969,6 +8752,260 @@ msgid ""
 "poller."
 msgstr "IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 
+#: ../../mod/connedit.php:75
+msgid "Could not access contact record."
+msgstr "Kon geen toegang krijgen tot de connectie-gegevens."
+
+#: ../../mod/connedit.php:99
+msgid "Could not locate selected profile."
+msgstr "Kon het gekozen profiel niet vinden."
+
+#: ../../mod/connedit.php:223
+msgid "Connection updated."
+msgstr "Connectie bijgewerkt."
+
+#: ../../mod/connedit.php:225
+msgid "Failed to update connection record."
+msgstr "Bijwerken van connectie-gegevens mislukt."
+
+#: ../../mod/connedit.php:272
+msgid "is now connected to"
+msgstr "is nu verbonden met"
+
+#: ../../mod/connedit.php:398
+msgid "Could not access address book record."
+msgstr "Kon geen toegang krijgen tot de record van de connectie."
+
+#: ../../mod/connedit.php:412
+msgid "Refresh failed - channel is currently unavailable."
+msgstr "Vernieuwen mislukt - kanaal is momenteel niet beschikbaar"
+
+#: ../../mod/connedit.php:427 ../../mod/connedit.php:436
+#: ../../mod/connedit.php:445 ../../mod/connedit.php:454
+#: ../../mod/connedit.php:467
+msgid "Unable to set address book parameters."
+msgstr "Niet in staat om de parameters van connecties in te stellen."
+
+#: ../../mod/connedit.php:491
+msgid "Connection has been removed."
+msgstr "Connectie is verwijderd"
+
+#: ../../mod/connedit.php:510
+#, php-format
+msgid "View %s's profile"
+msgstr "Profiel van %s weergeven"
+
+#: ../../mod/connedit.php:514
+msgid "Refresh Permissions"
+msgstr "Permissies vernieuwen"
+
+#: ../../mod/connedit.php:517
+msgid "Fetch updated permissions"
+msgstr "Aangepaste permissies ophalen"
+
+#: ../../mod/connedit.php:521
+msgid "Recent Activity"
+msgstr "Kanaal-activiteit"
+
+#: ../../mod/connedit.php:524
+msgid "View recent posts and comments"
+msgstr "Recente berichten en reacties weergeven"
+
+#: ../../mod/connedit.php:531
+msgid "Block (or Unblock) all communications with this connection"
+msgstr "Blokkeer (of deblokkeer) alle communicatie met deze connectie"
+
+#: ../../mod/connedit.php:532
+msgid "This connection is blocked!"
+msgstr "Deze connectie is geblokkeerd!"
+
+#: ../../mod/connedit.php:536
+msgid "Unignore"
+msgstr "Niet meer negeren"
+
+#: ../../mod/connedit.php:539
+msgid "Ignore (or Unignore) all inbound communications from this connection"
+msgstr "Negeer (of negeer niet meer) alle inkomende communicatie van deze connectie"
+
+#: ../../mod/connedit.php:540
+msgid "This connection is ignored!"
+msgstr "Deze connectie wordt genegeerd!"
+
+#: ../../mod/connedit.php:544
+msgid "Unarchive"
+msgstr "Niet meer archiveren"
+
+#: ../../mod/connedit.php:544
+msgid "Archive"
+msgstr "Archiveren"
+
+#: ../../mod/connedit.php:547
+msgid ""
+"Archive (or Unarchive) this connection - mark channel dead but keep content"
+msgstr "Archiveer (of dearchiveer) deze connectie - markeer het kanaal als dood, maar bewaar de inhoud"
+
+#: ../../mod/connedit.php:548
+msgid "This connection is archived!"
+msgstr "Deze connectie is gearchiveerd!"
+
+#: ../../mod/connedit.php:552
+msgid "Unhide"
+msgstr "Niet meer verbergen"
+
+#: ../../mod/connedit.php:552
+msgid "Hide"
+msgstr "Verbergen"
+
+#: ../../mod/connedit.php:555
+msgid "Hide or Unhide this connection from your other connections"
+msgstr "Deze connectie verbergen (of niet meer verbergen) voor jouw andere connecties"
+
+#: ../../mod/connedit.php:556
+msgid "This connection is hidden!"
+msgstr "Deze connectie is verborgen!"
+
+#: ../../mod/connedit.php:563
+msgid "Delete this connection"
+msgstr "Deze connectie verwijderen"
+
+#: ../../mod/connedit.php:644
+msgid "Approve this connection"
+msgstr "Deze connectie accepteren"
+
+#: ../../mod/connedit.php:644
+msgid "Accept connection to allow communication"
+msgstr "Keur deze connectie goed om communicatie toe te staan"
+
+#: ../../mod/connedit.php:649
+msgid "Set Affinity"
+msgstr "Verwantschapsfilter instellen"
+
+#: ../../mod/connedit.php:652
+msgid "Set Profile"
+msgstr "Profiel instellen"
+
+#: ../../mod/connedit.php:655
+msgid "Set Affinity & Profile"
+msgstr "Verwantschapsfilter en profiel instellen"
+
+#: ../../mod/connedit.php:688
+msgid "none"
+msgstr "geen"
+
+#: ../../mod/connedit.php:693
+msgid "Apply these permissions automatically"
+msgstr "Deze permissies automatisch toepassen"
+
+#: ../../mod/connedit.php:695
+msgid "This connection's primary address is"
+msgstr "Het primaire kanaaladres van deze connectie is"
+
+#: ../../mod/connedit.php:696
+msgid "Available locations:"
+msgstr "Beschikbare locaties:"
+
+#: ../../mod/connedit.php:700
+msgid ""
+"The permissions indicated on this page will be applied to all new "
+"connections."
+msgstr "Permissies die op deze pagina staan vermeld worden op alle nieuwe connecties toegepast."
+
+#: ../../mod/connedit.php:702
+msgid "Slide to adjust your degree of friendship"
+msgstr "Schuif om te bepalen hoe goed je iemand kent en/of mag"
+
+#: ../../mod/connedit.php:704
+msgid "Slide to adjust your rating"
+msgstr "Gebruik de schuif om je beoordeling te geven"
+
+#: ../../mod/connedit.php:705 ../../mod/connedit.php:710
+msgid "Optionally explain your rating"
+msgstr "Verklaar jouw beoordeling (niet verplicht)"
+
+#: ../../mod/connedit.php:707
+msgid "Custom Filter"
+msgstr "Berichtenfilter"
+
+#: ../../mod/connedit.php:708
+msgid "Only import posts with this text"
+msgstr "Importeer alleen berichten met deze tekst"
+
+#: ../../mod/connedit.php:708 ../../mod/connedit.php:709
+msgid ""
+"words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
+"all posts"
+msgstr "woorden (één per regel), #tags, /regex/ of talen (lang=iso639-1)  - laat leeg om alle berichten te importeren"
+
+#: ../../mod/connedit.php:709
+msgid "Do not import posts with this text"
+msgstr "Importeer geen berichten met deze tekst"
+
+#: ../../mod/connedit.php:711
+msgid "This information is public!"
+msgstr "Deze informatie is openbaar!"
+
+#: ../../mod/connedit.php:716
+msgid "Connection Pending Approval"
+msgstr "Connectie moet nog goedgekeurd worden"
+
+#: ../../mod/connedit.php:717
+msgid "Connection Request"
+msgstr "Connectieverzoek"
+
+#: ../../mod/connedit.php:718
+#, php-format
+msgid ""
+"(%s) would like to connect with you. Please approve this connection to allow"
+" communication."
+msgstr "(%s) wil met jou verbinden. Keur dit connectieverzoek goed om onderling te kunnen communiceren."
+
+#: ../../mod/connedit.php:720
+msgid "Approve Later"
+msgstr "Later goedkeuren"
+
+#: ../../mod/connedit.php:723
+msgid "inherited"
+msgstr "geërfd"
+
+#: ../../mod/connedit.php:725
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
+msgstr "Kies het profiel dat je aan %s wil tonen wanneer hij/zij ingelogd jouw profiel wil bekijken."
+
+#: ../../mod/connedit.php:727
+msgid "Their Settings"
+msgstr "Hun instellingen"
+
+#: ../../mod/connedit.php:728
+msgid "My Settings"
+msgstr "Mijn instellingen"
+
+#: ../../mod/connedit.php:730
+msgid "Individual Permissions"
+msgstr "Individuele permissies"
+
+#: ../../mod/connedit.php:731
+msgid ""
+"Some permissions may be inherited from your channel's <a "
+"href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
+"priority than individual settings. You can <strong>not</strong> change those"
+" settings here."
+msgstr "Sommige permissies worden mogelijk overgeërfd van de <a href=\"settings\">privacy-instellingen</a> van jouw kanaal, die een hogere prioriteit hebben dan deze individuele instellingen. Je kan je deze overgeërfde permissies hier <strong>niet</strong> veranderen."
+
+#: ../../mod/connedit.php:732
+msgid ""
+"Some permissions may be inherited from your channel's <a "
+"href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
+"priority than individual settings. You can change those settings here but "
+"they wont have any impact unless the inherited setting changes."
+msgstr "Sommige permissies worden mogelijk overgeërfd van de <a href=\"settings\">privacy-instellingen</a> van jouw kanaal, die een hogere prioriteit hebben dan deze individuele permissies. Je kan de permissies hier veranderen, maar die hebben geen effect, tenzij de overgeërfde permissies worden veranderd. "
+
+#: ../../mod/connedit.php:733
+msgid "Last update:"
+msgstr "Laatste wijziging:"
+
 #: ../../mod/sharedwithme.php:94
 msgid "Files: shared with me"
 msgstr "Bestanden: met mij gedeeld"
@@ -9275,6 +9312,14 @@ msgstr "Xchan opzoeken"
 msgid "Lookup xchan beginning with (or webbie): "
 msgstr "Zoek een xchan (of webbie) die begint met:"
 
+#: ../../mod/cover_photo.php:130 ../../mod/cover_photo.php:177
+msgid "Cover Photos"
+msgstr "Omslagfoto's"
+
+#: ../../mod/cover_photo.php:352
+msgid "Upload Cover Photo"
+msgstr "Omslagfoto's uploaden"
+
 #: ../../view/theme/redbasic/php/config.php:82
 msgid "Focus (Hubzilla default)"
 msgstr "Focus (Hubzilla-standaard)"
diff --git a/view/nl/hstrings.php b/view/nl/hstrings.php
index 7f91a390e..1502bbb68 100644
--- a/view/nl/hstrings.php
+++ b/view/nl/hstrings.php
@@ -517,7 +517,7 @@ $a->strings["Enable tab to display only Network posts that you've interacted on"
 $a->strings["Network New Tab"] = "Nieuwe netwerktab";
 $a->strings["Enable tab to display all new Network activity"] = "Laat de tab alle nieuwe netwerkactiviteit tonen";
 $a->strings["Affinity Tool"] = "Verwantschapsfilter";
-$a->strings["Filter stream activity by depth of relationships"] = "Filter wat je in de Matrix ziet op hoe goed je iemand kent of mag";
+$a->strings["Filter stream activity by depth of relationships"] = "Filter wat je in jouw grid ziet op hoe goed je iemand kent of mag";
 $a->strings["Connection Filtering"] = "Berichtenfilters";
 $a->strings["Filter incoming posts from connections based on keywords/content"] = "Filter binnenkomende berichten van connecties aan de hand van trefwoorden en taal";
 $a->strings["Suggest Channels"] = "Kanalen voorstellen";
@@ -609,6 +609,7 @@ $a->strings["Love/Romance:"] = "Liefde/romantiek:";
 $a->strings["Work/employment:"] = "Werk/beroep:";
 $a->strings["School/education:"] = "School/opleiding:";
 $a->strings["Like this thing"] = "Vind dit ding leuk";
+$a->strings["cover photo"] = "omslagfoto";
 $a->strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "Kan geen dubbele kanaal-identificator op deze hub aanmaken. Importeren mislukt.";
 $a->strings["Channel clone failed. Import failed."] = "Het klonen van het kanaal is mislukt. Importeren mislukt.";
 $a->strings["Cloned channel not found. Import failed."] = "Gekloond kanaal niet gevonden. Importeren mislukt.";
@@ -937,6 +938,10 @@ $a->strings["Blocks"] = "Blokken";
 $a->strings["Menus"] = "Menu's";
 $a->strings["Layouts"] = "Lay-outs";
 $a->strings["Pages"] = "Pagina's";
+$a->strings["Invalid data packet"] = "Datapakket ongeldig";
+$a->strings["Unable to verify channel signature"] = "Kanaalkenmerk kon niet worden geverifieerd.  ";
+$a->strings["Unable to verify site signature for %s"] = "Hubkenmerk voor %s kon niet worden geverifieerd";
+$a->strings["invalid target signature"] = "ongeldig doelkenmerk";
 $a->strings["System"] = "Systeem";
 $a->strings["Create Personal App"] = "Persoonlijke app maken";
 $a->strings["Edit Personal App"] = "Persoonlijke app bewerken";
@@ -945,8 +950,8 @@ $a->strings["Suggestions"] = "Voorgestelde kanalen";
 $a->strings["See more..."] = "Meer...";
 $a->strings["You have %1$.0f of %2$.0f allowed connections."] = "Je hebt %1$.0f van de %2$.0f toegestane connecties.";
 $a->strings["Add New Connection"] = "Nieuwe connectie toevoegen";
-$a->strings["Enter the channel address"] = "Vul het adres van het nieuwe kanaal in";
-$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Voorbeeld: bob@example.com, http://example.com/barbara";
+$a->strings["Enter channel address"] = "Vul kanaaladres in";
+$a->strings["Examples: bob@example.com, https://example.com/barbara"] = "Voorbeelden: bob@example.com, http://example.com/barbara";
 $a->strings["Notes"] = "Aantekeningen";
 $a->strings["Remove term"] = "Verwijder zoekterm";
 $a->strings["Archives"] = "Archieven";
@@ -1007,10 +1012,6 @@ $a->strings["Plugin Features"] = "Plug-in-opties";
 $a->strings["User registrations waiting for confirmation"] = "Accounts die op goedkeuring wachten";
 $a->strings["View Photo"] = "Foto weergeven";
 $a->strings["Edit Album"] = "Album bewerken";
-$a->strings["Invalid data packet"] = "Datapakket ongeldig";
-$a->strings["Unable to verify channel signature"] = "Kanaalkenmerk kon niet worden geverifieerd.  ";
-$a->strings["Unable to verify site signature for %s"] = "Hubkenmerk voor %s kon niet worden geverifieerd";
-$a->strings["invalid target signature"] = "ongeldig doelkenmerk";
 $a->strings["Not Found"] = "Niet gevonden";
 $a->strings["Page not found."] = "Pagina niet gevonden.";
 $a->strings["Some blurb about what to do when you're new here"] = "Welkom op \$Projectname. Klik op de tab ontdekken of klik rechtsboven op de <a href=\"directory\">kanalengids</a>, om kanalen te vinden. Rechtsboven vind je ook <a href=\"directory\">apps</a>, waar je vrijwel alle functies van \$Projectname kunt vinden. Voor <a href=\"directory\">hulp</a> met \$Projectname klik je op het vraagteken.";
@@ -1099,7 +1100,7 @@ $a->strings["Poll interval"] = "Poll-interval";
 $a->strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "De achtergrondprocessen voor het afleveren met zoveel seconden vertragen om de systeembelasting te verminderen. 0 om de afleveringsinterval te gebruiken.";
 $a->strings["Maximum Load Average"] = "Maximaal gemiddelde systeembelasting";
 $a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Maximale systeembelasting voordat de afleverings- en polllingsprocessen worden uitgesteld. Standaard is 50.";
-$a->strings["Expiration period in days for imported (matrix/network) content"] = "Aantal dagen waarna geïmporteerde inhoud uit iemands matrix/netwerk-pagina wordt verwijderd.";
+$a->strings["Expiration period in days for imported (matrix/network) content"] = "Aantal dagen waarna geïmporteerde inhoud uit iemands grid/netwerk-pagina wordt verwijderd.";
 $a->strings["0 for no expiration of imported content"] = "Dit geldt alleen voor inhoud van andere kanalen, dus niet voor iemands eigen kanaal. 0 voor het niet verwijderen van geïmporteerde inhoud.";
 $a->strings["Off"] = "Uit";
 $a->strings["On"] = "Aan";
@@ -1187,6 +1188,10 @@ $a->strings["Enable"] = "Inschakelen";
 $a->strings["Toggle"] = "Omschakelen";
 $a->strings["Author: "] = "Auteur: ";
 $a->strings["Maintainer: "] = "Beheerder: ";
+$a->strings["Minimum project version: "] = "Minimum versie Hubzilla: ";
+$a->strings["Maximum project version: "] = "Maximum versie Hubzilla:";
+$a->strings["Minimum PHP version: "] = "Minimum versie PHP: ";
+$a->strings["Disabled - version incompatibility"] = "Uitgeschakeld - versie is incompatibel";
 $a->strings["No themes found."] = "Geen thema's gevonden";
 $a->strings["Screenshot"] = "Schermafdruk";
 $a->strings["[Experimental]"] = "[Experimenteel]";
@@ -1263,80 +1268,21 @@ $a->strings["Blocked"] = "Geblokkeerd";
 $a->strings["Ignored"] = "Genegeerd";
 $a->strings["Hidden"] = "Verborgen";
 $a->strings["Archived"] = "Gearchiveerd";
-$a->strings["Suggest new connections"] = "Nieuwe kanalen voorstellen";
 $a->strings["New Connections"] = "Nieuwe connecties";
 $a->strings["Show pending (new) connections"] = "Nog te accepteren (nieuwe) connecties weergeven";
 $a->strings["All Connections"] = "Alle connecties";
 $a->strings["Show all connections"] = "Toon alle connecties";
-$a->strings["Unblocked"] = "Niet geblokkeerd";
-$a->strings["Only show unblocked connections"] = "Toon alleen niet geblokkeerde connecties";
 $a->strings["Only show blocked connections"] = "Toon alleen geblokkeerde connecties";
 $a->strings["Only show ignored connections"] = "Toon alleen genegeerde connecties";
 $a->strings["Only show archived connections"] = "Toon alleen gearchiveerde connecties";
 $a->strings["Only show hidden connections"] = "Toon alleen verborgen connecties";
+$a->strings["Pending"] = "Nog niet goedgekeurd";
 $a->strings["%1\$s [%2\$s]"] = "%1\$s [%2\$s]";
 $a->strings["Edit connection"] = "Connectie bewerken";
+$a->strings["Delete connection"] = "Connectie verwijderen";
+$a->strings["Connected"] = "Verbonden";
 $a->strings["Search your connections"] = "Doorzoek jouw connecties";
-$a->strings["Finding: "] = "Zoeken naar: ";
-$a->strings["Could not access contact record."] = "Kon geen toegang krijgen tot de connectie-gegevens.";
-$a->strings["Could not locate selected profile."] = "Kon het gekozen profiel niet vinden.";
-$a->strings["Connection updated."] = "Connectie bijgewerkt.";
-$a->strings["Failed to update connection record."] = "Bijwerken van connectie-gegevens mislukt.";
-$a->strings["is now connected to"] = "is nu verbonden met";
-$a->strings["Could not access address book record."] = "Kon geen toegang krijgen tot de record van de connectie.";
-$a->strings["Refresh failed - channel is currently unavailable."] = "Vernieuwen mislukt - kanaal is momenteel niet beschikbaar";
-$a->strings["Unable to set address book parameters."] = "Niet in staat om de parameters van connecties in te stellen.";
-$a->strings["Connection has been removed."] = "Connectie is verwijderd";
-$a->strings["View %s's profile"] = "Profiel van %s weergeven";
-$a->strings["Refresh Permissions"] = "Permissies vernieuwen";
-$a->strings["Fetch updated permissions"] = "Aangepaste permissies ophalen";
-$a->strings["Recent Activity"] = "Kanaal-activiteit";
-$a->strings["View recent posts and comments"] = "Recente berichten en reacties weergeven";
-$a->strings["Block (or Unblock) all communications with this connection"] = "Blokkeer (of deblokkeer) alle communicatie met deze connectie";
-$a->strings["This connection is blocked!"] = "Deze connectie is geblokkeerd!";
-$a->strings["Unignore"] = "Niet meer negeren";
-$a->strings["Ignore"] = "Negeren";
-$a->strings["Ignore (or Unignore) all inbound communications from this connection"] = "Negeer (of negeer niet meer) alle inkomende communicatie van deze connectie";
-$a->strings["This connection is ignored!"] = "Deze connectie wordt genegeerd!";
-$a->strings["Unarchive"] = "Niet meer archiveren";
-$a->strings["Archive"] = "Archiveren";
-$a->strings["Archive (or Unarchive) this connection - mark channel dead but keep content"] = "Archiveer (of dearchiveer) deze connectie - markeer het kanaal als dood, maar bewaar de inhoud";
-$a->strings["This connection is archived!"] = "Deze connectie is gearchiveerd!";
-$a->strings["Unhide"] = "Niet meer verbergen";
-$a->strings["Hide"] = "Verbergen";
-$a->strings["Hide or Unhide this connection from your other connections"] = "Deze connectie verbergen (of niet meer verbergen) voor jouw andere connecties";
-$a->strings["This connection is hidden!"] = "Deze connectie is verborgen!";
-$a->strings["Delete this connection"] = "Deze connectie verwijderen";
-$a->strings["Approve this connection"] = "Deze connectie accepteren";
-$a->strings["Accept connection to allow communication"] = "Keur deze connectie goed om communicatie toe te staan";
-$a->strings["Set Affinity"] = "Verwantschapsfilter instellen";
-$a->strings["Set Profile"] = "Profiel instellen";
-$a->strings["Set Affinity & Profile"] = "Verwantschapsfilter en profiel instellen";
-$a->strings["none"] = "geen";
-$a->strings["Apply these permissions automatically"] = "Deze permissies automatisch toepassen";
-$a->strings["This connection's primary address is"] = "Het primaire kanaaladres van deze connectie is";
-$a->strings["Available locations:"] = "Beschikbare locaties:";
-$a->strings["The permissions indicated on this page will be applied to all new connections."] = "Permissies die op deze pagina staan vermeld worden op alle nieuwe connecties toegepast.";
-$a->strings["Slide to adjust your degree of friendship"] = "Schuif om te bepalen hoe goed je iemand kent en/of mag";
-$a->strings["Slide to adjust your rating"] = "Gebruik de schuif om je beoordeling te geven";
-$a->strings["Optionally explain your rating"] = "Verklaar jouw beoordeling (niet verplicht)";
-$a->strings["Custom Filter"] = "Berichtenfilter";
-$a->strings["Only import posts with this text"] = "Importeer alleen berichten met deze tekst";
-$a->strings["words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts"] = "woorden (één per regel), #tags, /regex/ of talen (lang=iso639-1)  - laat leeg om alle berichten te importeren";
-$a->strings["Do not import posts with this text"] = "Importeer geen berichten met deze tekst";
-$a->strings["This information is public!"] = "Deze informatie is openbaar!";
-$a->strings["Connection Pending Approval"] = "Connectie moet nog goedgekeurd worden";
-$a->strings["Connection Request"] = "Connectieverzoek";
-$a->strings["(%s) would like to connect with you. Please approve this connection to allow communication."] = "(%s) wil met jou verbinden. Keur dit connectieverzoek goed om onderling te kunnen communiceren.";
-$a->strings["Approve Later"] = "Later goedkeuren";
-$a->strings["inherited"] = "geërfd";
-$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Kies het profiel dat je aan %s wil tonen wanneer hij/zij ingelogd jouw profiel wil bekijken.";
-$a->strings["Their Settings"] = "Hun instellingen";
-$a->strings["My Settings"] = "Mijn instellingen";
-$a->strings["Individual Permissions"] = "Individuele permissies";
-$a->strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can <strong>not</strong> change those settings here."] = "Sommige permissies worden mogelijk overgeërfd van de <a href=\"settings\">privacy-instellingen</a> van jouw kanaal, die een hogere prioriteit hebben dan deze individuele instellingen. Je kan je deze overgeërfde permissies hier <strong>niet</strong> veranderen.";
-$a->strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes."] = "Sommige permissies worden mogelijk overgeërfd van de <a href=\"settings\">privacy-instellingen</a> van jouw kanaal, die een hogere prioriteit hebben dan deze individuele permissies. Je kan de permissies hier veranderen, maar die hebben geen effect, tenzij de overgeërfde permissies worden veranderd. ";
-$a->strings["Last update:"] = "Laatste wijziging:";
+$a->strings["Connections search"] = "Connecties zoeken";
 $a->strings["\$Projectname channel"] = "\$Projectname-kanaal";
 $a->strings["Public access denied."] = "Openbare toegang geweigerd.";
 $a->strings["%d rating"] = array(
@@ -1516,7 +1462,7 @@ $a->strings["You have no more invitations available"] = "Je hebt geen uitnodigin
 $a->strings["Send invitations"] = "Uitnodigingen verzenden";
 $a->strings["Enter email addresses, one per line:"] = "Voer e-mailadressen in, één per regel:";
 $a->strings["Your message:"] = "Jouw bericht:";
-$a->strings["Please join my community on \$Projectname."] = "Hierbij nodig ik je uit om mij, en andere vrienden en kennissen, op \$Projectname te vergezellen. Lees meer over \$Projectname  op https://redmatrix.me.";
+$a->strings["Please join my community on \$Projectname."] = "Hierbij nodig ik je uit om mij, en andere vrienden en kennissen, op \$Projectname te vergezellen. Lees meer over \$Projectname  op http://hubzilla.org";
 $a->strings["You will need to supply this invitation code: "] = "Je moet deze uitnodigingscode opgeven: ";
 $a->strings["1. Register at any \$Projectname location (they are all inter-connected)"] = "1. Registreer je op een willekeurige \$Projectname-hub (ze zijn allemaal onderling met elkaar verbonden):";
 $a->strings["2. Enter my \$Projectname network address into the site searchbar."] = "2. Nadat je bent ingelogd en een kanaal hebt aangemaakt kan je mijn \$Projectname-kanaaladres in het zoekveld invullen:";
@@ -1685,6 +1631,7 @@ $a->strings["Channel Type"] = "Kanaaltype";
 $a->strings["Read more about roles"] = "Lees meer over kanaaltypes";
 $a->strings["Invalid request identifier."] = "Ongeldige verzoek identificator (request identifier)";
 $a->strings["Discard"] = "Annuleren";
+$a->strings["Ignore"] = "Negeren";
 $a->strings["No more system notifications."] = "Geen systeemnotificaties meer.";
 $a->strings["System Notifications"] = "Systeemnotificaties";
 $a->strings["Unable to find your hub."] = "Niet in staat om je hub te vinden";
@@ -1861,6 +1808,7 @@ $a->strings["Passwords do not match."] = "Wachtwoorden komen niet met elkaar ove
 $a->strings["Registration successful. Please check your email for validation instructions."] = "Registratie geslaagd. Controleer je e-mail voor instructies.";
 $a->strings["Your registration is pending approval by the site owner."] = "Jouw accountregistratie wacht op goedkeuring van de beheerder van deze \$Projectname-hub.";
 $a->strings["Your registration can not be processed."] = "Jouw registratie kan niet verwerkt worden.";
+$a->strings["Registration on this site is disabled."] = "Registreren van nieuwe accounts is op deze hub uitgeschakeld.";
 $a->strings["Registration on this site/hub is by approval only."] = "Registraties op deze \$Projectname-hub moeten eerst worden goedgekeurd.";
 $a->strings["<a href=\"pubsites\">Register at another affiliated site/hub</a>"] = "<a href=\"pubsites\">Registreer op een andere \$Projectname-hub</a>";
 $a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Deze \$Projectname-hub heeft het maximum aantal dagelijks toegestane registraties bereikt. Probeer het morgen (UTC) nogmaals.";
@@ -1869,6 +1817,7 @@ $a->strings["I accept the %s for this website"] = "Ik accepteer de %s van deze \
 $a->strings["I am over 13 years of age and accept the %s for this website"] = "Ik accepteer de %s van deze \$Projectname-hub";
 $a->strings["Membership on this site is by invitation only."] = "Registreren op deze \$Projectname-hub kan alleen op uitnodiging.";
 $a->strings["Please enter your invitation code"] = "Vul jouw uitnodigingscode in";
+$a->strings["Enter your name"] = "Vul jouw naam in";
 $a->strings["Your email address"] = "Jouw e-mailadres";
 $a->strings["Choose a password"] = "Geef een wachtwoord op";
 $a->strings["Please re-enter your password"] = "Geef het wachtwoord opnieuw op";
@@ -1949,10 +1898,10 @@ $a->strings["Link post titles to source"] = "Berichtkoppen naar originele locati
 $a->strings["System Page Layout Editor - (advanced)"] = "Lay-out bewerken van systeempagina's (geavanceerd)";
 $a->strings["Use blog/list mode on channel page"] = "Gebruik blog/lijst-modus op kanaalpagina";
 $a->strings["(comments displayed separately)"] = "(reacties worden afzonderlijk weergeven)";
-$a->strings["Use blog/list mode on matrix page"] = "Gebruik blog/lijst-modus op matrixpagina";
+$a->strings["Use blog/list mode on matrix page"] = "Gebruik blog/lijst-modus op gridpagina";
 $a->strings["Channel page max height of content (in pixels)"] = "Maximale hoogte berichtinhoud op kanaalpagina (in pixels)";
 $a->strings["click to expand content exceeding this height"] = "klik om inhoud uit te klappen die deze hoogte overschrijdt";
-$a->strings["Matrix page max height of content (in pixels)"] = "Maximale hoogte berichtinhoud op matrixpagina (in pixels)";
+$a->strings["Matrix page max height of content (in pixels)"] = "Maximale hoogte berichtinhoud op gridpagina (in pixels)";
 $a->strings["Nobody except yourself"] = "Niemand, behalve jezelf";
 $a->strings["Only those you specifically allow"] = "Alleen connecties met uitdrukkelijke toestemming";
 $a->strings["Approved connections"] = "Geaccepteerde connecties";
@@ -2007,7 +1956,7 @@ $a->strings["You receive a friend suggestion"] = "Je een kanaalvoorstel ontvangt
 $a->strings["You are tagged in a post"] = "Je expliciet in een bericht bent genoemd";
 $a->strings["You are poked/prodded/etc. in a post"] = "Je bent in een bericht aangestoten/gepord/etc.";
 $a->strings["Show visual notifications including:"] = "Toon de volgende zichtbare notificaties:";
-$a->strings["Unseen matrix activity"] = "Niet bekeken matrix-activiteit";
+$a->strings["Unseen matrix activity"] = "Niet bekeken grid-activiteit";
 $a->strings["Unseen channel activity"] = "Niet bekeken kanaal-activiteit";
 $a->strings["Unseen private messages"] = "Niet bekeken privéberichten";
 $a->strings["Recommended"] = "Aanbevolen";
@@ -2118,6 +2067,64 @@ $a->strings["The database configuration file \".htconfig.php\" could not be writ
 $a->strings["Errors encountered creating database tables."] = "Errors encountered creating database tables.";
 $a->strings["<h1>What next</h1>"] = "<h1>Wat nu</h1>";
 $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANT: You will need to [manually] setup a scheduled task for the poller.";
+$a->strings["Could not access contact record."] = "Kon geen toegang krijgen tot de connectie-gegevens.";
+$a->strings["Could not locate selected profile."] = "Kon het gekozen profiel niet vinden.";
+$a->strings["Connection updated."] = "Connectie bijgewerkt.";
+$a->strings["Failed to update connection record."] = "Bijwerken van connectie-gegevens mislukt.";
+$a->strings["is now connected to"] = "is nu verbonden met";
+$a->strings["Could not access address book record."] = "Kon geen toegang krijgen tot de record van de connectie.";
+$a->strings["Refresh failed - channel is currently unavailable."] = "Vernieuwen mislukt - kanaal is momenteel niet beschikbaar";
+$a->strings["Unable to set address book parameters."] = "Niet in staat om de parameters van connecties in te stellen.";
+$a->strings["Connection has been removed."] = "Connectie is verwijderd";
+$a->strings["View %s's profile"] = "Profiel van %s weergeven";
+$a->strings["Refresh Permissions"] = "Permissies vernieuwen";
+$a->strings["Fetch updated permissions"] = "Aangepaste permissies ophalen";
+$a->strings["Recent Activity"] = "Kanaal-activiteit";
+$a->strings["View recent posts and comments"] = "Recente berichten en reacties weergeven";
+$a->strings["Block (or Unblock) all communications with this connection"] = "Blokkeer (of deblokkeer) alle communicatie met deze connectie";
+$a->strings["This connection is blocked!"] = "Deze connectie is geblokkeerd!";
+$a->strings["Unignore"] = "Niet meer negeren";
+$a->strings["Ignore (or Unignore) all inbound communications from this connection"] = "Negeer (of negeer niet meer) alle inkomende communicatie van deze connectie";
+$a->strings["This connection is ignored!"] = "Deze connectie wordt genegeerd!";
+$a->strings["Unarchive"] = "Niet meer archiveren";
+$a->strings["Archive"] = "Archiveren";
+$a->strings["Archive (or Unarchive) this connection - mark channel dead but keep content"] = "Archiveer (of dearchiveer) deze connectie - markeer het kanaal als dood, maar bewaar de inhoud";
+$a->strings["This connection is archived!"] = "Deze connectie is gearchiveerd!";
+$a->strings["Unhide"] = "Niet meer verbergen";
+$a->strings["Hide"] = "Verbergen";
+$a->strings["Hide or Unhide this connection from your other connections"] = "Deze connectie verbergen (of niet meer verbergen) voor jouw andere connecties";
+$a->strings["This connection is hidden!"] = "Deze connectie is verborgen!";
+$a->strings["Delete this connection"] = "Deze connectie verwijderen";
+$a->strings["Approve this connection"] = "Deze connectie accepteren";
+$a->strings["Accept connection to allow communication"] = "Keur deze connectie goed om communicatie toe te staan";
+$a->strings["Set Affinity"] = "Verwantschapsfilter instellen";
+$a->strings["Set Profile"] = "Profiel instellen";
+$a->strings["Set Affinity & Profile"] = "Verwantschapsfilter en profiel instellen";
+$a->strings["none"] = "geen";
+$a->strings["Apply these permissions automatically"] = "Deze permissies automatisch toepassen";
+$a->strings["This connection's primary address is"] = "Het primaire kanaaladres van deze connectie is";
+$a->strings["Available locations:"] = "Beschikbare locaties:";
+$a->strings["The permissions indicated on this page will be applied to all new connections."] = "Permissies die op deze pagina staan vermeld worden op alle nieuwe connecties toegepast.";
+$a->strings["Slide to adjust your degree of friendship"] = "Schuif om te bepalen hoe goed je iemand kent en/of mag";
+$a->strings["Slide to adjust your rating"] = "Gebruik de schuif om je beoordeling te geven";
+$a->strings["Optionally explain your rating"] = "Verklaar jouw beoordeling (niet verplicht)";
+$a->strings["Custom Filter"] = "Berichtenfilter";
+$a->strings["Only import posts with this text"] = "Importeer alleen berichten met deze tekst";
+$a->strings["words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts"] = "woorden (één per regel), #tags, /regex/ of talen (lang=iso639-1)  - laat leeg om alle berichten te importeren";
+$a->strings["Do not import posts with this text"] = "Importeer geen berichten met deze tekst";
+$a->strings["This information is public!"] = "Deze informatie is openbaar!";
+$a->strings["Connection Pending Approval"] = "Connectie moet nog goedgekeurd worden";
+$a->strings["Connection Request"] = "Connectieverzoek";
+$a->strings["(%s) would like to connect with you. Please approve this connection to allow communication."] = "(%s) wil met jou verbinden. Keur dit connectieverzoek goed om onderling te kunnen communiceren.";
+$a->strings["Approve Later"] = "Later goedkeuren";
+$a->strings["inherited"] = "geërfd";
+$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Kies het profiel dat je aan %s wil tonen wanneer hij/zij ingelogd jouw profiel wil bekijken.";
+$a->strings["Their Settings"] = "Hun instellingen";
+$a->strings["My Settings"] = "Mijn instellingen";
+$a->strings["Individual Permissions"] = "Individuele permissies";
+$a->strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can <strong>not</strong> change those settings here."] = "Sommige permissies worden mogelijk overgeërfd van de <a href=\"settings\">privacy-instellingen</a> van jouw kanaal, die een hogere prioriteit hebben dan deze individuele instellingen. Je kan je deze overgeërfde permissies hier <strong>niet</strong> veranderen.";
+$a->strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes."] = "Sommige permissies worden mogelijk overgeërfd van de <a href=\"settings\">privacy-instellingen</a> van jouw kanaal, die een hogere prioriteit hebben dan deze individuele permissies. Je kan de permissies hier veranderen, maar die hebben geen effect, tenzij de overgeërfde permissies worden veranderd. ";
+$a->strings["Last update:"] = "Laatste wijziging:";
 $a->strings["Files: shared with me"] = "Bestanden: met mij gedeeld";
 $a->strings["NEW"] = "NIEUW";
 $a->strings["Remove all files"] = "Verwijder alle bestanden";
@@ -2185,6 +2192,8 @@ $a->strings["Source of Item"] = "Bron van item";
 $a->strings["Page Title"] = "Paginatitel";
 $a->strings["Xchan Lookup"] = "Xchan opzoeken";
 $a->strings["Lookup xchan beginning with (or webbie): "] = "Zoek een xchan (of webbie) die begint met:";
+$a->strings["Cover Photos"] = "Omslagfoto's";
+$a->strings["Upload Cover Photo"] = "Omslagfoto's uploaden";
 $a->strings["Focus (Hubzilla default)"] = "Focus (Hubzilla-standaard)";
 $a->strings["Theme settings"] = "Thema-instellingen";
 $a->strings["Select scheme"] = "Kies schema van thema";
diff --git a/view/pt-br/htconfig.tpl b/view/pt-br/htconfig.tpl
index cc4087f96..773125154 100644
--- a/view/pt-br/htconfig.tpl
+++ b/view/pt-br/htconfig.tpl
@@ -8,6 +8,7 @@ $db_port = '{{$dbport}}';
 $db_user = '{{$dbuser}}';
 $db_pass = '{{$dbpass}}';
 $db_data = '{{$dbdata}}';
+$db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres
 
 /*
  * Notice: Many of the following settings will be available in the admin panel 
diff --git a/view/ru/htconfig.tpl b/view/ru/htconfig.tpl
index cc4087f96..773125154 100644
--- a/view/ru/htconfig.tpl
+++ b/view/ru/htconfig.tpl
@@ -8,6 +8,7 @@ $db_port = '{{$dbport}}';
 $db_user = '{{$dbuser}}';
 $db_pass = '{{$dbpass}}';
 $db_data = '{{$dbdata}}';
+$db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres
 
 /*
  * Notice: Many of the following settings will be available in the admin panel 
diff --git a/view/sv/htconfig.tpl b/view/sv/htconfig.tpl
index cc4087f96..773125154 100644
--- a/view/sv/htconfig.tpl
+++ b/view/sv/htconfig.tpl
@@ -8,6 +8,7 @@ $db_port = '{{$dbport}}';
 $db_user = '{{$dbuser}}';
 $db_pass = '{{$dbpass}}';
 $db_data = '{{$dbdata}}';
+$db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres
 
 /*
  * Notice: Many of the following settings will be available in the admin panel 
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 5fcf901fb..4ae08dec8 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -310,6 +310,11 @@ footer {
 	margin-bottom: 0px;
 }
 
+.connect-btn-wrapper {
+	margin-bottom: 10px;
+
+}
+
 .profile-edit-side-link {
 	padding: 3px 0px;
 	opacity: 0;
@@ -475,53 +480,15 @@ footer {
 	float: right;
 }
 
-.rconnect {
-	display: block;
-	color: $nav_active_icon_colour;
-	margin-top: 15px;
-	background-color: $nav_bg;
-	-webkit-border-radius: $radiuspx ;
-	-moz-border-radius: $radiuspx;
-	border-radius: $radiuspx;
-	border: 1px solid $nav_bd;
-	padding: 5px;
-	font-weight: bold;
-	clear: both;
-}
-
-a.rateme, div.rateme {
-	display: block;
-	color: $nav_active_icon_colour;
-	background-color: $nav_bg;
-	-webkit-border-radius: $radiuspx ;
-	-moz-border-radius: $radiuspx;
-	border-radius: $radiuspx;
-	border: 1px solid $nav_bd;
-	padding: 5px;
-	font-weight: bold;
-	clear: both;
-}
-
 #pause {
 	position: fixed;
 	bottom: 5px;
 	right: 5px;
 }
 
-#vcard-end {
-	clear: both;
-}
-
 #contact-block {
 	width: 100%;
 	float: left;
-	background-color: rgba(254,254,254,0.5);
-	border-bottom: 1px solid rgba(238,238,238,0.8);
-	-moz-border-radius: $radiuspx;
-	-webkit-border-radius: $radiuspx;
-	border-radius: $radiuspx;
-	padding: 10px;
-	margin-bottom:10px;
 }
 
 #contact-block-numcontacts {
diff --git a/view/theme/redbasic/schema/bluegrid.css b/view/theme/redbasic/schema/bluegrid.css
index f0ae1e8df..38701024f 100644
--- a/view/theme/redbasic/schema/bluegrid.css
+++ b/view/theme/redbasic/schema/bluegrid.css
@@ -160,6 +160,14 @@ nav .badge:hover, nav .badge:focus {
     color: rgba(255,255,255,.8);
 }
 
+.widget .conv-participants {
+	color: #BBB;
+}
+
+.widget .active:hover .conv-participants, .widget .active:focus .conv-participants {
+	color: inherit;
+}
+
 .help-block, .comment-icon, .jot-icons, .admin-icons {
 	color: inherit;
 }
diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css
index 936f74761..f65e9aac9 100644
--- a/view/theme/redbasic/schema/dark.css
+++ b/view/theme/redbasic/schema/dark.css
@@ -88,7 +88,7 @@
     background-color: #111;
 }
 
-.jotnets-wrapper > a.btn {
+a.btn, aside a {
 	font-weight: 400 !important;
 }
 
diff --git a/view/theme/redbasic/schema/simple_black_on_white.css b/view/theme/redbasic/schema/simple_black_on_white.css
index f69ba3450..5a6b2655b 100644
--- a/view/theme/redbasic/schema/simple_black_on_white.css
+++ b/view/theme/redbasic/schema/simple_black_on_white.css
@@ -75,6 +75,10 @@
     background-color: #fff;
 }
 
+a.btn, aside a {
+	font-weight: 400 !important;
+}
+
 .btn-default {
     	background-color: #fff;
     	border-color: #000;
diff --git a/view/theme/redbasic/schema/simple_green_on_black.css b/view/theme/redbasic/schema/simple_green_on_black.css
index 1f0a2f1e6..d25585f98 100644
--- a/view/theme/redbasic/schema/simple_green_on_black.css
+++ b/view/theme/redbasic/schema/simple_green_on_black.css
@@ -75,6 +75,10 @@
     background-color: #000;
 }
 
+a.btn, aside a {
+	font-weight: 400 !important;
+}
+
 .btn-default {
     	background-color: #000;
     	border-color: #143D12;
diff --git a/view/theme/redbasic/schema/simple_white_on_black.css b/view/theme/redbasic/schema/simple_white_on_black.css
index 627f3ee5c..277ac7a12 100644
--- a/view/theme/redbasic/schema/simple_white_on_black.css
+++ b/view/theme/redbasic/schema/simple_white_on_black.css
@@ -71,6 +71,10 @@
     background-color: #000;
 }
 
+a.btn, aside a {
+	font-weight: 400 !important;
+}
+
 .btn-default {
     	background-color: #000;
     	border-color: #fff;
diff --git a/view/tpl/contact_block.tpl b/view/tpl/contact_block.tpl
index d1ce5ca67..a32437212 100755
--- a/view/tpl/contact_block.tpl
+++ b/view/tpl/contact_block.tpl
@@ -1,7 +1,9 @@
-<div id="contact-block">
-<div id="contact-block-numcontacts">{{$contacts}}</div>
+<div id="contact-block" class="widget">
+<h3>{{$contacts}}</h3>
 {{if $micropro}}
+		{{if $viewconnections}}
 		<a class="allcontact-link" href="viewconnections/{{$nickname}}">{{$viewconnections}}</a>
+		{{/if}}
 		<div class='contact-block-content'>
 		{{foreach $micropro as $m}}
 			{{$m}}
diff --git a/view/tpl/email_notify_html.tpl b/view/tpl/email_notify_html.tpl
index a2159c885..61ede1ca2 100755
--- a/view/tpl/email_notify_html.tpl
+++ b/view/tpl/email_notify_html.tpl
@@ -7,7 +7,7 @@
 <body>
 <table style="border:1px solid #ccc; background-color: #FFFFFF; color: #000000;">
 	<tbody>
-	<tr><td colspan="2" style="background:#43488A; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='{{$siteurl}}/images/hz-white-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">{{$product}}</div><div style="clear: both;"></div></td></tr>
+	<tr><td colspan="2" style="background:#43488A; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src="{{$notify_icon}}"><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">{{$product}}</div><div style="clear: both;"></div></td></tr>
 
 
 	<tr><td style="padding-top:22px;" colspan="2">{{$preamble}}</td></tr>
diff --git a/view/tpl/oexchange_xrd.tpl b/view/tpl/oexchange_xrd.tpl
index 74ef22874..e865e07d9 100755
--- a/view/tpl/oexchange_xrd.tpl
+++ b/view/tpl/oexchange_xrd.tpl
@@ -4,23 +4,23 @@
     <Subject>{{$base}}</Subject>
 
     <Property 
-        type="http://www.oexchange.org/spec/0.8/prop/vendor">Friendika</Property>
+        type="http://www.oexchange.org/spec/0.8/prop/vendor">Zotlabs</Property>
     <Property 
-        type="http://www.oexchange.org/spec/0.8/prop/title">Friendika Social Network</Property>
+        type="http://www.oexchange.org/spec/0.8/prop/title">Hubzilla</Property>
     <Property 
-        type="http://www.oexchange.org/spec/0.8/prop/name">Friendika</Property>
+        type="http://www.oexchange.org/spec/0.8/prop/name">Hubzilla</Property>
     <Property 
-        type="http://www.oexchange.org/spec/0.8/prop/prompt">Send to Friendika</Property>
+        type="http://www.oexchange.org/spec/0.8/prop/prompt">Send to Hubzilla</Property>
 
     <Link 
         rel="icon" 
-        href="{{$base}}/images/friendika-16.png"
+        href="{{$base}}/images/hz-16.png"
         type="image/png" 
         />
 
     <Link 
         rel="icon32" 
-        href="{{$base}}/images/friendika-32.png"
+        href="{{$base}}/images/hz-32.png"
         type="image/png" 
         />
 
diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index c52c2cd81..5857ae5d1 100755
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -1,5 +1,8 @@
 <div class="vcard">
 	<div id="profile-photo-wrapper"><img class="photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
+	{{if $connect}}
+	<div class="connect-btn-wrapper"><a href="{{$connect_url}}" class="btn btn-block btn-success btn-sm"><i class="icon-plus"></i> {{$connect}}</a></div>
+	{{/if}}
 	{{if $profile.edit}}
 	<div class="dropdown">
 	<a class="profile-edit-side-link dropdown-toggle" data-toggle="dropdown" title="{{$profile.edit.3}}" href="#" ><i class="icon-pencil" title="{{$profile.edit.1}}" ></i></a>
@@ -45,16 +48,10 @@
 	{{if $diaspora}}
 	{{include file="diaspora_vcard.tpl"}}
 	{{/if}}
-
-{{if $connect}}
-<a href="{{$connect_url}}" class="rconnect"><i class="icon-plus connect-icon"></i> {{$connect}}</a>
-{{/if}}
-
-{{$rating}}
-
 </div>
-<div id="vcard-end"></div>
+<div id="clear"></div>
 
+{{$rating}}
 
 {{$chanmenu}}
 
diff --git a/view/tpl/removeaccount.tpl b/view/tpl/removeaccount.tpl
index aefcd51a8..ce6c8ac22 100644
--- a/view/tpl/removeaccount.tpl
+++ b/view/tpl/removeaccount.tpl
@@ -10,7 +10,7 @@
 			<input type="hidden" name="verify" value="{{$hash}}" />
 			<div class="form-group" id="remove-account-pass-wrapper">
 				<label id="remove-account-pass-label" for="remove-account-pass">{{$passwd}}</label>
-				<input class="form-control" type="password" id="remove-account-pass" name="qxz_password" />
+				<input class="form-control" type="password" id="remove-account-pass" autocomplete="off" name="qxz_password"  value=" " />
 			</div>
 			{{include file="field_checkbox.tpl" field=$global}}
 			<button type="submit" name="submit" class="btn btn-danger">{{$submit}}</button>
diff --git a/view/tpl/removeme.tpl b/view/tpl/removeme.tpl
index 5b329dd6d..40b9546d2 100755
--- a/view/tpl/removeme.tpl
+++ b/view/tpl/removeme.tpl
@@ -10,7 +10,7 @@
 			<input type="hidden" name="verify" value="{{$hash}}" />
 			<div class="form-group" id="remove-account-pass-wrapper">
 				<label id="remove-account-pass-label" for="remove-account-pass">{{$passwd}}</label>
-				<input class="form-control" type="password" id="remove-account-pass" name="qxz_password" />
+				<input class="form-control" type="password" id="remove-account-pass" autocomplete="off" name="qxz_password" value=" " />
 			</div>
 			{{include file="field_checkbox.tpl" field=$global}}
 			<button type="submit" name="submit" class="btn btn-danger">{{$submit}}</button>
diff --git a/view/tpl/xchan_vcard.tpl b/view/tpl/xchan_vcard.tpl
index 2acbb24e4..ad409d75b 100755
--- a/view/tpl/xchan_vcard.tpl
+++ b/view/tpl/xchan_vcard.tpl
@@ -1,11 +1,10 @@
 <div class="vcard">
 <div id="profile-photo-wrapper"><a href="{{$link}}"><img class="vcard-photo photo" src="{{$photo}}" alt="{{$name}}" /></a></div>
+{{if $connect}}
+<div class="connect-btn-wrapper"><a href="follow?f=&url={{$follow}}" class="btn btn-block btn-success btn-sm"><i class="icon-plus"></i> {{$connect}}</a></div>
+{{/if}}
 <div class="fn">{{$name}}</div>
 </div>
 
 
-{{if $mode != 'mail'}}	
-{{if $connect}}
-	<a href="follow?f=&url={{$follow}}" class="rconnect"><i class="icon-plus connect-icon"></i> {{$connect}}</a>
-{{/if}}
-{{/if}}
+