Merge branch 'dev' into sabre32

25 files changed, 6420 insertions, 6391 deletions

diff --git a/README.md b/README.md
index ad7a4a9ca..8a6c003fc 100644
--- a/README.md
+++ b/README.md
@@ -3,8 +3,11 @@
 Hubzilla - Community Server
 ===========================
 
-Connected and linked web communities. 
--------------------------------------
+Groupware re-imagined and re-invented. 
+--------------------------------------
+
+Connect and link decentralised web communities. 
+-----------------------------------------------
 
 <p align="center" markdown="1">
 <em><a href="https://github.com/redmatrix/hubzilla/blob/master/install/INSTALL.txt">Installing Hubzilla</a></em> 
diff --git a/Zotlabs/Lib/AConfig.php b/Zotlabs/Lib/AConfig.php
new file mode 100644
index 000000000..24ec97dfa
--- /dev/null
+++ b/Zotlabs/Lib/AConfig.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Zotlabs\Lib;
+
+// account configuration storage is built on top of the under-utilised xconfig
+
+class AConfig {
+
+	static public function Load($account_id) {
+		return XConfig::Load('a_' . $account_id);
+	}
+
+	static public function Get($account_id,$family,$key) {
+		return XConfig::Get('a_' . $account_id,$family,$key);
+	}
+
+	static public function Set($account_id,$family,$key,$value) {
+		return XConfig::Get('a_' . $account_id,$family,$key,$value);
+	}
+
+	static public function Delete($account_id,$family,$key) {
+		return XConfig::Delete('a_' . $account_id,$family,$key);
+	}
+
+}
diff --git a/Zotlabs/Lib/AbConfig.php b/Zotlabs/Lib/AbConfig.php
new file mode 100644
index 000000000..f2d6522b9
--- /dev/null
+++ b/Zotlabs/Lib/AbConfig.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace Zotlabs\Lib;
+
+
+class AbConfig {
+
+	static public function Load($chash,$xhash) {
+		$r = q("select * from abconfig where chan = '%s' and xchan = '%s'",
+			dbesc($chash),
+			dbesc($xhash)
+		);
+		return $r;
+	}
+
+
+	static public function Get($chash,$xhash,$family,$key) {
+		$r = q("select * from abconfig where chan = '%s' and xchan = '%s' and cat = '%s' and k = '%s' limit 1",
+			dbesc($chash),
+			dbesc($xhash),
+			dbesc($family),
+			dbesc($key)		
+		);
+		if($r) {
+			return ((preg_match('|^a:[0-9]+:{.*}$|s', $r[0]['v'])) ? unserialize($r[0]['v']) : $r[0]['v']);
+		}
+		return false;
+	}
+
+
+	static public function Set($chash,$xhash,$family,$key,$value) {
+
+		$dbvalue = ((is_array($value))  ? serialize($value) : $value);
+		$dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue)  : $dbvalue);
+
+		if(self::Get($chash,$xhash,$family,$key) === false) {
+			$r = q("insert into abconfig ( chan, xchan, cat, k, v ) values ( '%s', '%s', '%s', '%s', '%s' ) ",
+				dbesc($chash),
+				dbesc($xhash),
+				dbesc($family),
+				dbesc($key),
+				dbesc($dbvalue)		
+			);
+		}
+		else {
+			$r = q("update abconfig set v = '%s' where chan = '%s' and xchan = '%s' and cat = '%s' and k = '%s' ",
+				dbesc($dbvalue),		
+				dbesc($chash),
+				dbesc($xhash),
+				dbesc($family),
+				dbesc($key)
+			);
+		}
+	
+		if($r)
+			return $value;
+		return false;
+	}
+
+
+	static public function Delete($chash,$xhash,$family,$key) {
+
+		$r = q("delete from abconfig where chan = '%s' and xchan = '%s' and cat = '%s' and k = '%s' ",
+			dbesc($chash),
+			dbesc($xhash),
+			dbesc($family),
+			dbesc($key)
+		);
+
+		return $r;
+	}
+
+}
\ No newline at end of file
diff --git a/Zotlabs/Lib/IConfig.php b/Zotlabs/Lib/IConfig.php
new file mode 100644
index 000000000..28c9ab58e
--- /dev/null
+++ b/Zotlabs/Lib/IConfig.php
@@ -0,0 +1,165 @@
+<?php
+
+namespace Zotlabs\Lib;
+
+
+
+class IConfig {
+
+	static public function Load(&$item) {
+		return;
+	}
+
+	static public function Get(&$item, $family, $key) {
+
+		$is_item = false;
+	
+		if(is_array($item)) {
+			$is_item = true;
+			if((! array_key_exists('iconfig',$item)) || (! is_array($item['iconfig'])))
+				$item['iconfig'] = array();
+
+			if(array_key_exists('item_id',$item))
+				$iid = $item['item_id'];
+			else
+				$iid = $item['id'];
+		}
+		elseif(intval($item))
+			$iid = $item;
+
+		if(! $iid)
+			return false;
+
+		if(is_array($item) && array_key_exists('iconfig',$item) && is_array($item['iconfig'])) {
+			foreach($item['iconfig'] as $c) {
+				if($c['iid'] == $iid && $c['cat'] == $family && $c['k'] == $key)
+					return $c['v'];
+			}
+		}
+		 
+		$r = q("select * from iconfig where iid = %d and cat = '%s' and k = '%s' limit 1",
+			intval($iid),
+			dbesc($family),
+			dbesc($key)
+		);
+		if($r) {
+			$r[0]['v'] = ((preg_match('|^a:[0-9]+:{.*}$|s',$r[0]['v'])) ? unserialize($r[0]['v']) : $r[0]['v']);
+			if($is_item)
+				$item['iconfig'][] = $r[0];
+			return $r[0]['v'];
+		}
+		return false;
+
+	}
+
+	/**
+	 * IConfig::Set(&$item, $family, $key, $value, $sharing = false);
+	 *
+	 * $item - item array or item id. If passed an array the iconfig meta information is
+	 *    added to the item structure (which will need to be saved with item_store eventually).
+	 *    If passed an id, the DB is updated, but may not be federated and/or cloned.
+	 * $family - namespace of meta variable
+	 * $key - key of meta variable
+	 * $value - value of meta variable
+	 * $sharing - boolean (default false); if true the meta information is propagated with the item
+	 *   to other sites/channels, mostly useful when $item is an array and has not yet been stored/delivered.
+	 *   If the meta information is added after delivery and you wish it to be shared, it may be necessary to 
+	 *   alter the item edited timestamp and invoke the delivery process on the updated item. The edited 
+	 *   timestamp needs to be altered in order to trigger an item_store_update() at the receiving end.
+	 */
+ 
+
+	static public function Set(&$item, $family, $key, $value, $sharing = false) {
+
+		$dbvalue = ((is_array($value))  ? serialize($value) : $value);
+		$dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue)  : $dbvalue);
+
+		$is_item = false;
+		$idx = null;
+
+		if(is_array($item)) {
+			$is_item = true;
+			if((! array_key_exists('iconfig',$item)) || (! is_array($item['iconfig'])))
+				$item['iconfig'] = array();
+			elseif($item['iconfig']) {
+				for($x = 0; $x < count($item['iconfig']); $x ++) {
+					if($item['iconfig'][$x]['cat'] == $family && $item['iconfig'][$x]['k'] == $key) {
+						$idx = $x;
+					}
+				}
+			}
+			$entry = array('cat' => $family, 'k' => $key, 'v' => $value, 'sharing' => $sharing);
+
+			if(is_null($idx))
+				$item['iconfig'][] = $entry;
+			else
+				$item['iconfig'][$idx] = $entry;
+			return $value;
+		}
+
+		if(intval($item))
+			$iid = intval($item);
+
+		if(! $iid)
+			return false;
+
+		if(self::Get($item, $family, $key) === false) {
+			$r = q("insert into iconfig( iid, cat, k, v, sharing ) values ( %d, '%s', '%s', '%s', %d ) ",
+				intval($iid),
+				dbesc($family),
+				dbesc($key),
+				dbesc($dbvalue),
+				intval($sharing)
+			);
+		}
+		else {
+			$r = q("update iconfig set v = '%s', sharing = %d where iid = %d and cat = '%s' and  k = '%s' ",
+				dbesc($dbvalue),
+				intval($sharing),
+				intval($iid),
+				dbesc($family),
+				dbesc($key)
+			);
+		}
+
+		if(! $r)
+			return false;
+
+		return $value;
+	}
+
+
+
+	static public function Delete(&$item, $family, $key) {
+
+
+		$is_item = false;
+		$idx = null;
+
+		if(is_array($item)) {
+			$is_item = true;
+			if(is_array($item['iconfig'])) {
+				for($x = 0; $x < count($item['iconfig']); $x ++) {
+					if($item['iconfig'][$x]['cat'] == $family && $item['iconfig'][$x]['k'] == $key) {
+						unset($item['iconfig'][$x]);
+					}
+				}
+			}
+			return true;
+		}
+
+		if(intval($item))
+			$iid = intval($item);
+
+		if(! $iid)
+			return false;
+
+		return q("delete from iconfig where iid = %d and cat = '%s' and  k = '%s' ",
+			intval($iid),
+			dbesc($family),
+			dbesc($key)
+		);
+
+	}
+
+}
\ No newline at end of file
diff --git a/Zotlabs/Lib/PConfig.php b/Zotlabs/Lib/PConfig.php
new file mode 100644
index 000000000..195321375
--- /dev/null
+++ b/Zotlabs/Lib/PConfig.php
@@ -0,0 +1,189 @@
+<?php /** @file */
+
+namespace Zotlabs\Lib;
+
+
+class PConfig {
+
+	/**
+	 * @brief Loads all configuration values of a channel into a cached storage.
+	 *
+	 * All configuration values of the given channel are stored in global cache
+	 * which is available under the global variable App::$config[$uid].
+	 *
+	 * @param string $uid
+	 *  The channel_id
+	 * @return void|false Nothing or false if $uid is false
+	 */
+
+	static public function Load($uid) {
+		if($uid === false)
+			return false;
+
+		if(! array_key_exists($uid, \App::$config))
+			\App::$config[$uid] = array();
+
+		$r = q("SELECT * FROM pconfig WHERE uid = %d",
+			intval($uid)
+		);
+
+		if($r) {
+			foreach($r as $rr) {
+				$k = $rr['k'];
+				$c = $rr['cat'];
+				if(! array_key_exists($c, \App::$config[$uid])) {
+					\App::$config[$uid][$c] = array();
+					\App::$config[$uid][$c]['config_loaded'] = true;
+				}
+				\App::$config[$uid][$c][$k] = $rr['v'];
+			}
+		}
+	}
+
+	/**
+	 * @brief Get a particular channel's config variable given the category name
+	 * ($family) and a key.
+	 *
+	 * Get a particular channel's config value from the given category ($family)
+	 * and the $key from a cached storage in App::$config[$uid].
+	 *
+	 * Returns false if not set.
+	 *
+	 * @param string $uid
+	 *  The channel_id
+	 * @param string $family
+	 *  The category of the configuration value
+	 * @param string $key
+	 *  The configuration key to query
+	 * @param boolean $instore (deprecated, without function)
+	 * @return mixed Stored value or false if it does not exist
+	 */
+
+	static public function Get($uid,$family,$key,$instore = false) {
+
+		if($uid === false)
+			return false;
+
+		if(! array_key_exists($uid, \App::$config))
+			self::Load($uid);
+
+		if((! array_key_exists($family, \App::$config[$uid])) || (! array_key_exists($key, \App::$config[$uid][$family])))
+			return false;
+
+		return ((! is_array(\App::$config[$uid][$family][$key])) && (preg_match('|^a:[0-9]+:{.*}$|s', \App::$config[$uid][$family][$key])) 
+			? unserialize(\App::$config[$uid][$family][$key])
+			: \App::$config[$uid][$family][$key]
+		);
+
+	}
+
+	/**
+	 * @brief Sets a configuration value for a channel.
+	 *
+	 * Stores a config value ($value) in the category ($family) under the key ($key)
+	 * for the channel_id $uid.
+	 *
+	 * @param string $uid
+	 *  The channel_id
+	 * @param string $family
+	 *  The category of the configuration value
+	 * @param string $key
+	 *  The configuration key to set
+	 * @param string $value
+	 *  The value to store
+	 * @return mixed Stored $value or false
+	 */
+
+	static public function Set($uid, $family, $key, $value) {
+
+		// this catches subtle errors where this function has been called 
+		// with local_channel() when not logged in (which returns false)
+		// and throws an error in array_key_exists below. 
+		// we provide a function backtrace in the logs so that we can find
+		// and fix the calling function.
+
+		if($uid === false) {
+			btlogger('UID is FALSE!', LOGGER_NORMAL, LOG_ERR);
+			return;
+		}
+
+		// manage array value
+		$dbvalue = ((is_array($value))  ? serialize($value) : $value);
+		$dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue)  : $dbvalue);
+
+		if(get_pconfig($uid, $family, $key) === false) {
+			if(! array_key_exists($uid, \App::$config))
+				\App::$config[$uid] = array();
+			if(! array_key_exists($family, \App::$config[$uid]))
+				\App::$config[$uid][$family] = array();
+
+			$ret = q("INSERT INTO pconfig ( uid, cat, k, v ) VALUES ( %d, '%s', '%s', '%s' ) ",
+				intval($uid),
+				dbesc($family),
+				dbesc($key),
+				dbesc($dbvalue)
+			);
+
+		}
+		else {
+
+			$ret = q("UPDATE pconfig SET v = '%s' WHERE uid = %d and cat = '%s' AND k = '%s'",
+				dbesc($dbvalue),
+				intval($uid),
+				dbesc($family),
+				dbesc($key)
+			);
+
+		}
+
+		// keep a separate copy for all variables which were
+		// set in the life of this page. We need this to
+		// synchronise channel clones.
+
+		if(! array_key_exists('transient', \App::$config[$uid]))
+			\App::$config[$uid]['transient'] = array();
+		if(! array_key_exists($family, \App::$config[$uid]['transient']))
+			\App::$config[$uid]['transient'][$family] = array();
+
+		\App::$config[$uid][$family][$key] = $value;
+		\App::$config[$uid]['transient'][$family][$key] = $value;
+
+		if($ret)
+			return $value;
+
+		return $ret;
+	}
+
+
+	/**
+	 * @brief Deletes the given key from the channel's configuration.
+	 *
+	 * Removes the configured value from the stored cache in App::$config[$uid]
+	 * and removes it from the database.
+	 *
+	 * @param string $uid
+	 *  The channel_id
+	 * @param string $family
+	 *  The category of the configuration value
+	 * @param string $key
+	 *  The configuration key to delete
+	 * @return mixed
+	 */
+ 
+	static public function Delete($uid, $family, $key) {
+
+		$ret = false;
+
+		if(array_key_exists($key, \App::$config[$uid][$family]))
+			unset(\App::$config[$uid][$family][$key]);
+			$ret = q("DELETE FROM pconfig WHERE uid = %d AND cat = '%s' AND k = '%s'",
+				intval($uid),
+				dbesc($family),
+				dbesc($key)
+			);
+
+		return $ret;
+	}
+
+}
+		
\ No newline at end of file
diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php
index e55931f40..f724ac95d 100644
--- a/Zotlabs/Lib/ThreadItem.php
+++ b/Zotlabs/Lib/ThreadItem.php
@@ -15,7 +15,7 @@ class ThreadItem {
 	private $comment_box_template = 'comment_item.tpl';
 	private $commentable = false;
 	// list of supported reaction emojis - a site can over-ride this via config system.reactions
-	private $reactions = ['1f60a','1f44f','1f37e','1f48b','1f61e','2665','1f622','1f62e','1f634','1f61c','1f607','1f608'];
+	private $reactions = ['1f60a','1f44f','1f37e','1f48b','1f61e','2665','1f606','1f62e','1f634','1f61c','1f607','1f608'];
 	private $toplevel = false;
 	private $children = array();
 	private $parent = null;
diff --git a/Zotlabs/Lib/XConfig.php b/Zotlabs/Lib/XConfig.php
new file mode 100644
index 000000000..e28dcf559
--- /dev/null
+++ b/Zotlabs/Lib/XConfig.php
@@ -0,0 +1,160 @@
+<?php
+
+namespace Zotlabs\Lib;
+
+
+class XConfig {
+
+	/**
+	 * @brief Loads a full xchan's configuration into a cached storage.
+	 *
+	 * All configuration values of the given observer hash are stored in global
+	 * cache which is available under the global variable App::$config[$xchan].
+	 *
+	 * @param string $xchan
+	 *  The observer's hash
+	 * @return void|false Returns false if xchan is not set
+	 */
+
+	static public function Load($xchan) {
+
+		if(! $xchan)
+			return false;
+
+		if(! array_key_exists($xchan, \App::$config))
+			\App::$config[$xchan] = array();
+
+		$r = q("SELECT * FROM xconfig WHERE xchan = '%s'",
+			dbesc($xchan)
+		);
+
+		if($r) {
+			foreach($r as $rr) {
+				$k = $rr['k'];
+				$c = $rr['cat'];
+				if(! array_key_exists($c, \App::$config[$xchan])) {
+					\App::$config[$xchan][$c] = array();
+					\App::$config[$xchan][$c]['config_loaded'] = true;
+				}
+				\App::$config[$xchan][$c][$k] = $rr['v'];
+			}
+		}
+	}
+
+	/**
+	 * @brief Get a particular observer's config variable given the category
+	 * name ($family) and a key.
+	 *
+	 * Get a particular observer's config value from the given category ($family)
+	 * and the $key from a cached storage in App::$config[$xchan].
+	 *
+	 * Returns false if not set.
+	 *
+	 * @param string $xchan
+	 *  The observer's hash
+	 * @param string $family
+	 *  The category of the configuration value
+	 * @param string $key
+	 *  The configuration key to query
+	 * @return mixed Stored $value or false if it does not exist
+	 */
+
+	static public function Get($xchan, $family, $key) {
+
+		if(! $xchan)
+			return false;
+
+		if(! array_key_exists($xchan, \App::$config))
+			load_xconfig($xchan);
+
+		if((! array_key_exists($family, \App::$config[$xchan])) || (! array_key_exists($key, \App::$config[$xchan][$family])))
+			return false;
+
+		return ((! is_array(\App::$config[$xchan][$family][$key])) && (preg_match('|^a:[0-9]+:{.*}$|s', \App::$config[$xchan][$family][$key])) 
+			? unserialize(\App::$config[$xchan][$family][$key])
+			: \App::$config[$xchan][$family][$key]
+		);
+	}
+
+	/**
+	 * @brief Sets a configuration value for an observer.
+	 *
+	 * Stores a config value ($value) in the category ($family) under the key ($key)
+	 * for the observer's $xchan hash.
+	 *
+	 *
+	 * @param string $xchan
+	 *  The observer's hash
+	 * @param string $family
+	 *  The category of the configuration value
+	 * @param string $key
+	 *  The configuration key to set
+	 * @param string $value
+	 *  The value to store
+	 * @return mixed Stored $value or false
+	 */
+
+	static public function Set($xchan, $family, $key, $value) {
+
+		// manage array value
+		$dbvalue = ((is_array($value))  ? serialize($value) : $value);
+		$dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue)  : $dbvalue);
+
+		if(self::Get($xchan, $family, $key) === false) {
+			if(! array_key_exists($xchan, \App::$config))
+				\App::$config[$xchan] = array();
+			if(! array_key_exists($family, \App::$config[$xchan]))
+				\App::$config[$xchan][$family] = array();
+
+			$ret = q("INSERT INTO xconfig ( xchan, cat, k, v ) VALUES ( '%s', '%s', '%s', '%s' ) ",
+				dbesc($xchan),
+				dbesc($family),
+				dbesc($key),
+				dbesc($dbvalue)
+			);
+		}
+		else {
+			$ret = q("UPDATE xconfig SET v = '%s' WHERE xchan = '%s' and cat = '%s' AND k = '%s'",
+				dbesc($dbvalue),
+				dbesc($xchan),
+				dbesc($family),
+				dbesc($key)
+			);
+		}
+
+		App::$config[$xchan][$family][$key] = $value;
+
+		if($ret)
+			return $value;
+		return $ret;
+	}
+
+	/**
+	 * @brief Deletes the given key from the observer's config.
+	 *
+	 * Removes the configured value from the stored cache in App::$config[$xchan]
+	 * and removes it from the database.
+	 *
+	 * @param string $xchan
+	 *  The observer's hash
+	 * @param string $family
+	 *  The category of the configuration value
+	 * @param string $key
+	 *  The configuration key to delete
+	 * @return mixed
+	 */
+
+	static public function Delete($xchan, $family, $key) {
+
+		if(x(\App::$config[$xchan][$family], $key))
+			unset(\App::$config[$xchan][$family][$key]);
+		$ret = q("DELETE FROM xconfig WHERE xchan = '%s' AND cat = '%s' AND k = '%s'",
+			dbesc($xchan),
+			dbesc($family),
+			dbesc($key)
+		);
+
+		return $ret;
+	}
+
+}
\ No newline at end of file
diff --git a/Zotlabs/Module/Admin.php b/Zotlabs/Module/Admin.php
index b2c6baf1d..21ab7f6a7 100644
--- a/Zotlabs/Module/Admin.php
+++ b/Zotlabs/Module/Admin.php
@@ -32,8 +32,8 @@ class Admin extends \Zotlabs\Web\Controller {
 				case 'site':
 					$this->admin_page_site_post($a);
 					break;
-				case 'users':
-					$this->admin_page_users_post($a);
+				case 'accounts':
+					$this->admin_page_accounts_post($a);
 					break;
 				case 'channels':
 					$this->admin_page_channels_post($a);
@@ -127,8 +127,8 @@ class Admin extends \Zotlabs\Web\Controller {
 				case 'site':
 					$o = $this->admin_page_site($a);
 					break;
-				case 'users':
-					$o = $this->admin_page_users($a);
+				case 'accounts':
+					$o = $this->admin_page_accounts($a);
 					break;
 				case 'channels':
 					$o = $this->admin_page_channels($a);
@@ -872,20 +872,20 @@ class Admin extends \Zotlabs\Web\Controller {
 	}
 	
 	/**
-	 * @brief Handle POST actions on users admin page.
+	 * @brief Handle POST actions on accounts admin page.
 	 *
 	 * This function is called when on the admin user/account page the form was
 	 * submitted to handle multiple operations at once. If one of the icons next
-	 * to an entry are pressed the function admin_page_users() will handle this.
+	 * to an entry are pressed the function admin_page_accounts() will handle this.
 	 *
 	 * @param App $a
 	 */
-	function admin_page_users_post($a) {
+	function admin_page_accounts_post($a) {
 		$pending = ( x($_POST, 'pending') ? $_POST['pending'] : array() );
 		$users   = ( x($_POST, 'user')    ? $_POST['user']    : array() );
 		$blocked = ( x($_POST, 'blocked') ? $_POST['blocked'] : array() );
 	
-		check_form_security_token_redirectOnErr('/admin/users', 'admin_users');
+		check_form_security_token_redirectOnErr('/admin/accounts', 'admin_accounts');
 	
 		// change to switch structure?
 		// account block/unblock button was submitted
@@ -901,7 +901,7 @@ class Admin extends \Zotlabs\Web\Controller {
 			notice( sprintf( tt("%s account blocked/unblocked", "%s account blocked/unblocked", count($users)), count($users)) );
 		}
 		// account delete button was submitted
-		if (x($_POST, 'page_users_delete')) {
+		if (x($_POST, 'page_accounts_delete')) {
 			foreach ($users as $uid){
 				account_remove($uid, true, false);
 			}
@@ -920,20 +920,20 @@ class Admin extends \Zotlabs\Web\Controller {
 			}
 		}
 	
-		goaway(z_root() . '/admin/users' );
+		goaway(z_root() . '/admin/accounts' );
 	}
 	
 	/**
-	 * @brief Generate users admin page and handle single item operations.
+	 * @brief Generate accounts admin page and handle single item operations.
 	 *
-	 * This function generates the users/account admin page and handles the actions
+	 * This function generates the accounts/account admin page and handles the actions
 	 * if an icon next to an entry was clicked. If several items were selected and
-	 * the form was submitted it is handled by the function admin_page_users_post().
+	 * the form was submitted it is handled by the function admin_page_accounts_post().
 	 *
 	 * @param App &$a
 	 * @return string
 	 */
-	function admin_page_users(&$a){
+	function admin_page_accounts(&$a){
 		if (argc() > 2) {
 			$uid = argv(3);
 			$account = q("SELECT * FROM account WHERE account_id = %d",
@@ -942,10 +942,10 @@ class Admin extends \Zotlabs\Web\Controller {
 	
 			if (! $account) {
 				notice( t('Account not found') . EOL);
-				goaway(z_root() . '/admin/users' );
+				goaway(z_root() . '/admin/accounts' );
 			}
 	
-			check_form_security_token_redirectOnErr('/admin/users', 'admin_users', 't');
+			check_form_security_token_redirectOnErr('/admin/accounts', 'admin_accounts', 't');
 	
 			switch (argv(2)){
 				case 'delete':
@@ -972,7 +972,7 @@ class Admin extends \Zotlabs\Web\Controller {
 					break;
 			}
 	
-			goaway(z_root() . '/admin/users' );
+			goaway(z_root() . '/admin/accounts' );
 		}
 	
 		/* get pending */
@@ -980,7 +980,7 @@ class Admin extends \Zotlabs\Web\Controller {
 			intval(ACCOUNT_PENDING)
 		);
 	
-		/* get users */
+		/* get accounts */
 	
 		$total = q("SELECT count(*) as total FROM account");
 		if (count($total)) {
@@ -988,22 +988,20 @@ class Admin extends \Zotlabs\Web\Controller {
 			\App::set_pager_itemspage(100);
 		}
 	
-	
-	//	We'll still need to link email addresses to admin/users/channels or some such, but this bit doesn't exist yet.
-	//	That's where we need to be doing last post/channel flags/etc, not here.
-	
 		$serviceclass = (($_REQUEST['class']) ? " and account_service_class = '" . dbesc($_REQUEST['class']) . "' " : '');
+
+		$key = (($_REQUEST['key']) ? dbesc($_REQUEST['key']) : 'account_id');
+		$dir = 'asc';
+		if(array_key_exists('dir',$_REQUEST))
+			$dir = ((intval($_REQUEST['dir'])) ? 'asc' : 'desc');
+
+		$base = z_root() . '/admin/accounts?f=';
+		$odir = (($dir === 'asc') ? '0' : '1');
 	
-		$order = " order by account_email asc ";
-		if($_REQUEST['order'] === 'expires')
-			$order = " order by account_expires desc ";
-		if($_REQUEST['order'] === 'created')
-			$order = " order by account_created desc ";
-	
-		$users = q("SELECT `account_id` , `account_email`, `account_lastlog`, `account_created`, `account_expires`, " . 			"`account_service_class`, ( account_flags & %d )>0 as `blocked`, " .
+		$users = q("SELECT `account_id` , `account_email`, `account_lastlog`, `account_created`, `account_expires`, " . 			"`account_service_class`, ( account_flags & %d ) > 0 as `blocked`, " .
 				"(SELECT %s FROM channel as ch " .
 				"WHERE ch.channel_account_id = ac.account_id and ch.channel_removed = 0 ) as `channels` " .
-			"FROM account as ac where true $serviceclass $order limit %d offset %d ",
+			"FROM account as ac where true $serviceclass order by $key $dir limit %d offset %d ",
 			intval(ACCOUNT_BLOCKED),
 			db_concat('ch.channel_address', ' '),
 			intval(\App::$pager['itemspage']),
@@ -1026,14 +1024,14 @@ class Admin extends \Zotlabs\Web\Controller {
 	//	}
 	//	$users = array_map("_setup_users", $users);
 	
-		$t = get_markup_template('admin_users.tpl');
+		$t = get_markup_template('admin_accounts.tpl');
 		$o = replace_macros($t, array(
 			// strings //
 			'$title' => t('Administration'),
-			'$page' => t('Users'),
+			'$page' => t('Accounts'),
 			'$submit' => t('Submit'),
 			'$select_all' => t('select all'),
-			'$h_pending' => t('User registrations waiting for confirm'),
+			'$h_pending' => t('Registrations waiting for confirm'),
 			'$th_pending' => array( t('Request date'), t('Email') ),
 			'$no_pending' =>  t('No registrations.'),
 			'$approve' => t('Approve'),
@@ -1041,14 +1039,22 @@ class Admin extends \Zotlabs\Web\Controller {
 			'$delete' => t('Delete'),
 			'$block' => t('Block'),
 			'$unblock' => t('Unblock'),
-	
-			'$h_users' => t('Users'),
-			'$th_users' => array( t('ID'), t('Email'), t('All Channels'), t('Register date'), t('Last login'), t('Expires'), t('Service Class')),
+			'$odir' => $odir,
+			'$base' => $base,
+			'$h_users' => t('Accounts'),
+			'$th_users' => array( 
+				[ t('ID'), 'account_id' ],
+				[ t('Email'), 'account_email' ],
+				[ t('All Channels'), 'channels' ],
+				[ t('Register date'), 'account_created' ],
+				[ t('Last login'), 'account_lastlog' ],
+				[ t('Expires'), 'account_expires' ],
+				[ t('Service Class'), 'account_service_class'] ),
 	
 			'$confirm_delete_multi' => t('Selected accounts will be deleted!\n\nEverything these accounts had posted on this site will be permanently deleted!\n\nAre you sure?'),
 			'$confirm_delete' => t('The account {0} will be deleted!\n\nEverything this account has posted on this site will be permanently deleted!\n\nAre you sure?'),
 	
-			'$form_security_token' => get_form_security_token("admin_users"),
+			'$form_security_token' => get_form_security_token("admin_accounts"),
 	
 			// values //
 			'$baseurl' => z_root(),
@@ -1158,6 +1164,17 @@ class Admin extends \Zotlabs\Web\Controller {
 			}
 			goaway(z_root() . '/admin/channels' );
 		}
+
+
+		$key = (($_REQUEST['key']) ? dbesc($_REQUEST['key']) : 'channel_id');
+		$dir = 'asc';
+		if(array_key_exists('dir',$_REQUEST))
+			$dir = ((intval($_REQUEST['dir'])) ? 'asc' : 'desc');
+
+		$base = z_root() . '/admin/channels?f=';
+		$odir = (($dir === 'asc') ? '0' : '1');
+
+
 	
 		/* get channels */
 	
@@ -1166,14 +1183,12 @@ class Admin extends \Zotlabs\Web\Controller {
 			\App::set_pager_total($total[0]['total']);
 			\App::set_pager_itemspage(100);
 		}
-	
-		$order = " order by channel_name asc ";
-	
-		$channels = q("SELECT * from channel where channel_removed = 0 and channel_system = 0 $order limit %d offset %d ",
+
+		$channels = q("SELECT * from channel where channel_removed = 0 and channel_system = 0 order by $key $dir limit %d offset %d ",
 			intval(\App::$pager['itemspage']),
 			intval(\App::$pager['start'])
 		);
-	
+
 		if($channels) {
 			for($x = 0; $x < count($channels); $x ++) {
 				if($channels[$x]['channel_pageflags'] & PAGE_CENSORED)
@@ -1201,7 +1216,12 @@ class Admin extends \Zotlabs\Web\Controller {
 			'$code' => t('Allow Code'),
 			'$uncode' => t('Disallow Code'),
 			'$h_channels' => t('Channel'),
-			'$th_channels' => array( t('UID'), t('Name'), t('Address')),
+			'$base' => $base,
+			'$odir' => $odir,
+			'$th_channels' => array( 
+					[ t('UID'), 'channel_id' ],
+					[ t('Name'), 'channel_name' ],
+					[ t('Address'), 'channel_address' ]),
 	
 			'$confirm_delete_multi' => t('Selected channels will be deleted!\n\nEverything that was posted in these channels on this site will be permanently deleted!\n\nAre you sure?'),
 			'$confirm_delete' => t('The channel {0} will be deleted!\n\nEverything that was posted in this channel on this site will be permanently deleted!\n\nAre you sure?'),
diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php
index ada7b4ef1..1bdc23897 100644
--- a/Zotlabs/Module/Photos.php
+++ b/Zotlabs/Module/Photos.php
@@ -510,7 +510,7 @@ class Photos extends \Zotlabs\Web\Controller {
 	
 	
 	
-		function get() {
+	function get() {
 	
 		// URLs:
 		// photos/name
@@ -1277,11 +1277,9 @@ class Photos extends \Zotlabs\Web\Controller {
 			\App::$page['htmlhead'] .= "\r\n" . '<link rel="alternate" type="application/json+oembed" href="' . z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . \App::$cmd) . '" title="oembed" />' . "\r\n";
 	
 	
-		$r = q("SELECT `resource_id`, max(`imgscale`) AS `imgscale` FROM `photo` WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s' 
+		$r = q("SELECT `resource_id`, max(`imgscale`) AS `imgscale` FROM `photo` WHERE `uid` = %d 
 			and photo_usage in ( %d, %d ) and is_nsfw = %d $sql_extra GROUP BY `resource_id`",
 			intval(\App::$data['channel']['channel_id']),
-			dbesc('Contact Photos'),
-			dbesc( t('Contact Photos')),
 			intval(PHOTO_NORMAL),
 			intval(PHOTO_PROFILE),
 			intval($unsafe)
@@ -1291,15 +1289,13 @@ class Photos extends \Zotlabs\Web\Controller {
 			\App::set_pager_itemspage(60);
 		}
 		
-		$r = q("SELECT p.resource_id, p.id, p.filename, p.mimetype, p.album, p.imgscale, p.created FROM photo as p 
-			INNER JOIN ( SELECT resource_id, max(imgscale) as imgscale FROM photo 
+		$r = q("SELECT p.resource_id, p.id, p.filename, p.mimetype, p.album, p.imgscale, p.created FROM photo p 
+			INNER JOIN ( SELECT resource_id, max(imgscale) imgscale FROM photo 
 				WHERE uid = %d AND photo_usage IN ( %d, %d ) 
-				AND is_nsfw = %d $sql_extra group by resource_id ) as ph 
+				AND is_nsfw = %d $sql_extra group by resource_id ) ph 
 			ON (p.resource_id = ph.resource_id and p.imgscale = ph.imgscale) 
 			ORDER by p.created DESC LIMIT %d OFFSET %d",
 			intval(\App::$data['channel']['channel_id']),
-			dbesc('Contact Photos'),
-			dbesc( t('Contact Photos')),
 			intval(PHOTO_NORMAL),
 			intval(PHOTO_PROFILE),
 			intval($unsafe),
diff --git a/boot.php b/boot.php
index 76312ed4e..a31d98dbb 100755
--- a/boot.php
+++ b/boot.php
@@ -1465,6 +1465,12 @@ function check_config(&$a) {
 							@unlink($lockfile);
 							//send the administrator an e-mail
 							file_put_contents($lockfile, $x);
+							
+							$r = q("select account_language from account where account_email = '%s' limit 1",
+								dbesc(App::$config['system']['admin_email'])
+							);
+							push_lang(($r) ? $r[0]['account_language'] : 'en');
+
 
 							$email_tpl = get_intltext_template("update_fail_eml.tpl");
 							$email_msg = replace_macros($email_tpl, array(
@@ -1482,6 +1488,7 @@ function check_config(&$a) {
 								. 'Content-transfer-encoding: 8bit' );
 							//try the logger
 							logger('CRITICAL: Update Failed: ' . $x);
+							pop_lang();
 						}
 						else
 							set_config('database','update_r' . $x, 'success');
diff --git a/doc/addons.bb b/doc/addons.bb
index 325a219ec..b83b3276a 100644
--- a/doc/addons.bb
+++ b/doc/addons.bb
@@ -86,6 +86,13 @@
 
 [h3]Addon Repositories[/h3]
 
+We [b]strongly recommend[/b] that authors of addons publish/submit them to the project addon repository. This has several advantages. Project developers can easily fix security flaws and make changes to comply with recent changes in core code. Addons provided in third-party repositories are considered untrusted. If the project core code changes in an incompatible way, there may be no alternative but to physically remove or rename the addon files in order to get your site working again. Often only the plugin/addon author can help you regain control of your website, and project developers are unable to assist you; because by definition your site configuration has been modified in ways that we cannot easily test or verify. 
+
+For these reasons we [b]strongly recommend[/b] that you do NOT install addons from third-party repositories.
+
+We also recognise that some developers prefer working on their own and do not wish their code to be mingled with the project repository for a variety of reasons. These developers can ease troubleshooting and debugging by providing a README file in their respective code repository outlining the process for submitting patches and bug fixes. It is also recommended that these projects provide both a 'dev' (development) and 'master' (production) branch which tracks the current project branches of those names. This is because dev and master are often not compatible from the viewpoint of library interfaces. It is also highly recommended that your repository versions are tagged and moved forward within 24 hours of project releases. This is a major inconvenience for everybdy involved, and can present downtime for production sites while this process is being carried out; which is one more reason why we [b]strongly recommend[/b] that addons be submitted to the project addon repository and that you do NOT install such third-party addons. 
+
+
 [url=https://github.com/redmatrix/hubzilla-addons]https://github.com/redmatrix/hubzilla-addons[/url] Main project addon repository
 
 [url=https://github.com/23n/red-addons]https://github.com/23n/red-addons[/url] Oliver's repository (mayan_places and flip)
diff --git a/include/api.php b/include/api.php
index f0d886d9b..be525f7e9 100644
--- a/include/api.php
+++ b/include/api.php
@@ -1904,10 +1904,15 @@ require_once('include/api_auth.php');
 
 		$ret = array();
 
+		$x = array('items' => $r,'api_user' => api_user(),'user_info' => $user_info);
+		call_hooks('api_format_items',$x);
+		$r = $x['items'];
+
 		if(! $r)
 			return $ret;
 
 		foreach($r as $item) {
+
 			localize_item($item);
 
 			$status_user = (($item['author_xchan']==$user_info['guid'])?$user_info: api_item_get_user($a,$item));
diff --git a/include/config.php b/include/config.php
index fe7cbead6..209d22d42 100644
--- a/include/config.php
+++ b/include/config.php
@@ -33,617 +33,99 @@
 
 use Zotlabs\Lib as Zlib;
 
-
-
 function load_config($family) {
-
 	Zlib\Config::Load($family);
-
 }
 
 function get_config($family, $key) {
-
 	return Zlib\Config::Get($family,$key);
-
 }
 
 function set_config($family, $key, $value) {
-
 	return Zlib\Config::Set($family,$key,$value);
-
 }
 
 function del_config($family, $key) {
-
 	return Zlib\Config::Delete($family,$key);
-
 }
 
-
-
-
-
-/**
- * @brief Loads all configuration values of a channel into a cached storage.
- *
- * All configuration values of the given channel are stored in global cache
- * which is available under the global variable App::$config[$uid].
- *
- * @param string $uid
- *  The channel_id
- * @return void|false Nothing or false if $uid is false
- */
-
 function load_pconfig($uid) {
-
-	if($uid === false)
-		return false;
-
-	if(! array_key_exists($uid, App::$config))
-		App::$config[$uid] = array();
-
-	$r = q("SELECT * FROM pconfig WHERE uid = %d",
-		intval($uid)
-	);
-
-	if($r) {
-		foreach($r as $rr) {
-			$k = $rr['k'];
-			$c = $rr['cat'];
-			if(! array_key_exists($c, App::$config[$uid])) {
-				App::$config[$uid][$c] = array();
-				App::$config[$uid][$c]['config_loaded'] = true;
-			}
-			App::$config[$uid][$c][$k] = $rr['v'];
-		}
-	}
+	Zlib\PConfig::Load($uid);
 }
 
-/**
- * @brief Get a particular channel's config variable given the category name
- * ($family) and a key.
- *
- * Get a particular channel's config value from the given category ($family)
- * and the $key from a cached storage in App::$config[$uid].
- *
- * Returns false if not set.
- *
- * @param string $uid
- *  The channel_id
- * @param string $family
- *  The category of the configuration value
- * @param string $key
- *  The configuration key to query
- * @param boolean $instore (deprecated, without function)
- * @return mixed Stored value or false if it does not exist
- */
 function get_pconfig($uid, $family, $key, $instore = false) {
-//	logger('include/config.php: get_pconfig() deprecated instore param used', LOGGER_DEBUG);
-
-	if($uid === false)
-		return false;
-
-	if(! array_key_exists($uid, App::$config))
-		load_pconfig($uid);
-
-	if((! array_key_exists($family, App::$config[$uid])) || (! array_key_exists($key, App::$config[$uid][$family])))
-		return false;
-
-	return ((! is_array(App::$config[$uid][$family][$key])) && (preg_match('|^a:[0-9]+:{.*}$|s', App::$config[$uid][$family][$key])) 
-		? unserialize(App::$config[$uid][$family][$key])
-		: App::$config[$uid][$family][$key]
-	);
+	return Zlib\PConfig::Get($uid,$family,$key,$instore = false);
 }
 
-/**
- * @brief Sets a configuration value for a channel.
- *
- * Stores a config value ($value) in the category ($family) under the key ($key)
- * for the channel_id $uid.
- *
- * @note Please do not store booleans - convert to 0/1 integer values!
- *
- * @param string $uid
- *  The channel_id
- * @param string $family
- *  The category of the configuration value
- * @param string $key
- *  The configuration key to set
- * @param string $value
- *  The value to store
- * @return mixed Stored $value or false
- */
 function set_pconfig($uid, $family, $key, $value) {
-
-	// this catches subtle errors where this function has been called 
-	// with local_channel() when not logged in (which returns false)
-	// and throws an error in array_key_exists below. 
-	// we provide a function backtrace in the logs so that we can find
-	// and fix the calling function.
-
-	if($uid === false) {
-		btlogger('UID is FALSE!', LOGGER_NORMAL, LOG_ERR);
-		return;
-	}
-
-	// manage array value
-	$dbvalue = ((is_array($value))  ? serialize($value) : $value);
-	$dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue)  : $dbvalue);
-
-	if(get_pconfig($uid, $family, $key) === false) {
-		if(! array_key_exists($uid, App::$config))
-			App::$config[$uid] = array();
-		if(! array_key_exists($family, App::$config[$uid]))
-			App::$config[$uid][$family] = array();
-
-		// keep a separate copy for all variables which were
-		// set in the life of this page. We need this to
-		// synchronise channel clones.
-
-		if(! array_key_exists('transient', App::$config[$uid]))
-			App::$config[$uid]['transient'] = array();
-		if(! array_key_exists($family, App::$config[$uid]['transient']))
-			App::$config[$uid]['transient'][$family] = array();
-
-		App::$config[$uid][$family][$key] = $value;
-		App::$config[$uid]['transient'][$family][$key] = $value;
-
-		$ret = q("INSERT INTO pconfig ( uid, cat, k, v ) VALUES ( %d, '%s', '%s', '%s' ) ",
-			intval($uid),
-			dbesc($family),
-			dbesc($key),
-			dbesc($dbvalue)
-		);
-		if($ret)
-			return $value;
-
-		return $ret;
-	}
-
-	$ret = q("UPDATE pconfig SET v = '%s' WHERE uid = %d and cat = '%s' AND k = '%s'",
-		dbesc($dbvalue),
-		intval($uid),
-		dbesc($family),
-		dbesc($key)
-	);
-
-	// keep a separate copy for all variables which were
-	// set in the life of this page. We need this to
-	// synchronise channel clones.
-
-	if(! array_key_exists('transient', App::$config[$uid]))
-		App::$config[$uid]['transient'] = array();
-	if(! array_key_exists($family, App::$config[$uid]['transient']))
-		App::$config[$uid]['transient'][$family] = array();
-
-	App::$config[$uid][$family][$key] = $value;
-	App::$config[$uid]['transient'][$family][$key] = $value;
-
-	if($ret)
-		return $value;
-
-	return $ret;
+	return Zlib\PConfig::Set($uid,$family,$key,$value);
 }
 
-/**
- * @brief Deletes the given key from the channel's configuration.
- *
- * Removes the configured value from the stored cache in App::$config[$uid]
- * and removes it from the database.
- *
- * @param string $uid
- *  The channel_id
- * @param string $family
- *  The category of the configuration value
- * @param string $key
- *  The configuration key to delete
- * @return mixed
- */
 function del_pconfig($uid, $family, $key) {
-
-	$ret = false;
-
-	if (x(App::$config[$uid][$family], $key))
-		unset(App::$config[$uid][$family][$key]);
-		$ret = q("DELETE FROM pconfig WHERE uid = %d AND cat = '%s' AND k = '%s'",
-		intval($uid),
-		dbesc($family),
-		dbesc($key)
-	);
-
-	return $ret;
+	return Zlib\PConfig::Delete($uid,$family,$key);
 }
 
-
-/**
- * @brief Loads a full xchan's configuration into a cached storage.
- *
- * All configuration values of the given observer hash are stored in global
- * cache which is available under the global variable App::$config[$xchan].
- *
- * @param string $xchan
- *  The observer's hash
- * @return void|false Returns false if xchan is not set
- */
 function load_xconfig($xchan) {
-
-	if(! $xchan)
-		return false;
-
-	if(! array_key_exists($xchan, App::$config))
-		App::$config[$xchan] = array();
-
-	$r = q("SELECT * FROM xconfig WHERE xchan = '%s'",
-		dbesc($xchan)
-	);
-
-	if($r) {
-		foreach($r as $rr) {
-			$k = $rr['k'];
-			$c = $rr['cat'];
-			if(! array_key_exists($c, App::$config[$xchan])) {
-				App::$config[$xchan][$c] = array();
-				App::$config[$xchan][$c]['config_loaded'] = true;
-			}
-			App::$config[$xchan][$c][$k] = $rr['v'];
-		}
-	}
+	Zlib\XConfig::Load($xchan);
 }
 
-/**
- * @brief Get a particular observer's config variable given the category
- * name ($family) and a key.
- *
- * Get a particular observer's config value from the given category ($family)
- * and the $key from a cached storage in App::$config[$xchan].
- *
- * Returns false if not set.
- *
- * @param string $xchan
- *  The observer's hash
- * @param string $family
- *  The category of the configuration value
- * @param string $key
- *  The configuration key to query
- * @return mixed Stored $value or false if it does not exist
- */
 function get_xconfig($xchan, $family, $key) {
-
-	if(! $xchan)
-		return false;
-
-	if(! array_key_exists($xchan, App::$config))
-		load_xconfig($xchan);
-
-	if((! array_key_exists($family, App::$config[$xchan])) || (! array_key_exists($key, App::$config[$xchan][$family])))
-		return false;
-
-	return ((! is_array(App::$config[$xchan][$family][$key])) && (preg_match('|^a:[0-9]+:{.*}$|s', App::$config[$xchan][$family][$key])) 
-		? unserialize(App::$config[$xchan][$family][$key])
-		: App::$config[$xchan][$family][$key]
-	);
+	return Zlib\XConfig::Get($xchan,$family,$key);
 }
 
-/**
- * @brief Sets a configuration value for an observer.
- *
- * Stores a config value ($value) in the category ($family) under the key ($key)
- * for the observer's $xchan hash.
- *
- * @note Please do not store booleans - convert to 0/1 integer values!
- *
- * @param string $xchan
- *  The observer's hash
- * @param string $family
- *  The category of the configuration value
- * @param string $key
- *  The configuration key to set
- * @param string $value
- *  The value to store
- * @return mixed Stored $value or false
- */
 function set_xconfig($xchan, $family, $key, $value) {
-
-	// manage array value
-	$dbvalue = ((is_array($value))  ? serialize($value) : $value);
-	$dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue)  : $dbvalue);
-
-	if(get_xconfig($xchan, $family, $key) === false) {
-		if(! array_key_exists($xchan, App::$config))
-			App::$config[$xchan] = array();
-		if(! array_key_exists($family, App::$config[$xchan]))
-			App::$config[$xchan][$family] = array();
-
-		App::$config[$xchan][$family][$key] = $value;
-		$ret = q("INSERT INTO xconfig ( xchan, cat, k, v ) VALUES ( '%s', '%s', '%s', '%s' ) ",
-			dbesc($xchan),
-			dbesc($family),
-			dbesc($key),
-			dbesc($dbvalue)
-		);
-		if($ret)
-			return $value;
-		return $ret;
-	}
-
-	$ret = q("UPDATE xconfig SET v = '%s' WHERE xchan = '%s' and cat = '%s' AND k = '%s'",
-		dbesc($dbvalue),
-		dbesc($xchan),
-		dbesc($family),
-		dbesc($key)
-	);
-
-	App::$config[$xchan][$family][$key] = $value;
-
-	if($ret)
-		return $value;
-	return $ret;
+	return Zlib\XConfig::Set($xchan,$family,$key,$value);
 }
 
-/**
- * @brief Deletes the given key from the observer's config.
- *
- * Removes the configured value from the stored cache in App::$config[$xchan]
- * and removes it from the database.
- *
- * @param string $xchan
- *  The observer's hash
- * @param string $family
- *  The category of the configuration value
- * @param string $key
- *  The configuration key to delete
- * @return mixed
- */
 function del_xconfig($xchan, $family, $key) {
-
-	$ret = false;
-
-	if(x(App::$config[$xchan][$family], $key))
-		unset(App::$config[$xchan][$family][$key]);
-	$ret = q("DELETE FROM xconfig WHERE xchan = '%s' AND cat = '%s' AND k = '%s'",
-		dbesc($xchan),
-		dbesc($family),
-		dbesc($key)
-	);
-	return $ret;
+	return Zlib\XConfig::Delete($xchan,$family,$key);
 }
 
-
-// account configuration storage is built on top of the under-utilised xconfig
-
 function load_aconfig($account_id) {
-	load_xconfig('a_' . $account_id);
+	Zlib\AConfig::Load($account_id);
 }
 
 function get_aconfig($account_id, $family, $key) {
-	return get_xconfig('a_' . $account_id, $family, $key);
+	return Zlib\AConfig::Get($account_id, $family, $key);
 }
 
 function set_aconfig($account_id, $family, $key, $value) {
-	return set_xconfig('a_' . $account_id, $family, $key, $value);
+	return Zlib\AConfig::Set($account_id, $family, $key, $value);
 }
 
 function del_aconfig($account_id, $family, $key) {
-	return del_xconfig('a_' . $account_id, $family, $key);
+	return Zlib\AConfig::Delete($account_id, $family, $key);
 }
 
 
 function load_abconfig($chash,$xhash) {
-	$r = q("select * from abconfig where chan = '%s' and xchan = '%s'",
-		dbesc($chash),
-		dbesc($xhash)
-	);
-	return $r;
+	Zlib\AbConfig::Load($chash,$xhash);
 }
 
 function get_abconfig($chash,$xhash,$family,$key) {
-	$r = q("select * from abconfig where chan = '%s' and xchan = '%s' and cat = '%s' and k = '%s' limit 1",
-		dbesc($chash),
-		dbesc($xhash),
-		dbesc($family),
-		dbesc($key)		
-	);
-	if($r) {
-		return ((preg_match('|^a:[0-9]+:{.*}$|s', $r[0]['v'])) ? unserialize($r[0]['v']) : $r[0]['v']);
-	}
-	return false;
+	return Zlib\AbConfig::Get($chash,$xhash,$family,$key);
 }
 
-
 function set_abconfig($chash,$xhash,$family,$key,$value) {
-
-	$dbvalue = ((is_array($value))  ? serialize($value) : $value);
-	$dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue)  : $dbvalue);
-
-	if(get_abconfig($chash,$xhash,$family,$key) === false) {
-		$r = q("insert into abconfig ( chan, xchan, cat, k, v ) values ( '%s', '%s', '%s', '%s', '%s' ) ",
-			dbesc($chash),
-			dbesc($xhash),
-			dbesc($family),
-			dbesc($key),
-			dbesc($dbvalue)		
-		);
-	}
-	else {
-		$r = q("update abconfig set v = '%s' where chan = '%s' and xchan = '%s' and cat = '%s' and k = '%s' ",
-			dbesc($dbvalue),		
-			dbesc($chash),
-			dbesc($xhash),
-			dbesc($family),
-			dbesc($key)
-		);
-	}
-	if($r)
-		return $value;
-	return false;
+	return Zlib\AbConfig::Set($chash,$xhash,$family,$key,$value);
 }
 
-
 function del_abconfig($chash,$xhash,$family,$key) {
-
-	$r = q("delete from abconfig where chan = '%s' and xchan = '%s' and cat = '%s' and k = '%s' ",
-		dbesc($chash),
-		dbesc($xhash),
-		dbesc($family),
-		dbesc($key)
-	);
-
-	return $r;
+	return Zlib\AbConfig::Delete($chash,$xhash,$family,$key);
 }
 
-
-
-
-
+function load_iconfig(&$item) {
+	Zlib\IConfig::Load($item);
+}
 
 function get_iconfig(&$item, $family, $key) {
-
-	$is_item = false;
-	if(is_array($item)) {
-		$is_item = true;
-		if((! array_key_exists('iconfig',$item)) || (! is_array($item['iconfig'])))
-			$item['iconfig'] = array();
-
-		if(array_key_exists('item_id',$item))
-			$iid = $item['item_id'];
-		else
-			$iid = $item['id'];
-	}
-	elseif(intval($item))
-		$iid = $item;
-
-	if(! $iid)
-		return false;
-
-	if(is_array($item) && array_key_exists('iconfig',$item) && is_array($item['iconfig'])) {
-		foreach($item['iconfig'] as $c) {
-			if($c['iid'] == $iid && $c['cat'] == $family && $c['k'] == $key)
-				return $c['v'];
-		}
-	}
-		 
-	$r = q("select * from iconfig where iid = %d and cat = '%s' and k = '%s' limit 1",
-		intval($iid),
-		dbesc($family),
-		dbesc($key)
-	);
-	if($r) {
-		$r[0]['v'] = ((preg_match('|^a:[0-9]+:{.*}$|s',$r[0]['v'])) ? unserialize($r[0]['v']) : $r[0]['v']);
-		if($is_item)
-			$item['iconfig'][] = $r[0];
-		return $r[0]['v'];
-	}
-	return false;
-
+	return Zlib\IConfig::Get($item, $family, $key);
 }
 
-/**
- * set_iconfig(&$item, $family, $key, $value, $sharing = false);
- *
- * $item - item array or item id. If passed an array the iconfig meta information is
- *    added to the item structure (which will need to be saved with item_store eventually).
- *    If passed an id, the DB is updated, but may not be federated and/or cloned.
- * $family - namespace of meta variable
- * $key - key of meta variable
- * $value - value of meta variable
- * $sharing - boolean (default false); if true the meta information is propagated with the item
- *   to other sites/channels, mostly useful when $item is an array and has not yet been stored/delivered.
- *   If the meta information is added after delivery and you wish it to be shared, it may be necessary to 
- *   alter the item edited timestamp and invoke the delivery process on the updated item. The edited 
- *   timestamp needs to be altered in order to trigger an item_store_update() at the receiving end.
- */
- 
-
 function set_iconfig(&$item, $family, $key, $value, $sharing = false) {
-
-	$dbvalue = ((is_array($value))  ? serialize($value) : $value);
-	$dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue)  : $dbvalue);
-
-	$is_item = false;
-	$idx = null;
-
-	if(is_array($item)) {
-		$is_item = true;
-		if((! array_key_exists('iconfig',$item)) || (! is_array($item['iconfig'])))
-			$item['iconfig'] = array();
-		elseif($item['iconfig']) {
-			for($x = 0; $x < count($item['iconfig']); $x ++) {
-				if($item['iconfig'][$x]['cat'] == $family && $item['iconfig'][$x]['k'] == $key) {
-					$idx = $x;
-				}
-			}
-		}
-		$entry = array('cat' => $family, 'k' => $key, 'v' => $value, 'sharing' => $sharing);
-
-		if(is_null($idx))
-			$item['iconfig'][] = $entry;
-		else
-			$item['iconfig'][$idx] = $entry;
-		return $value;
-	}
-
-	if(intval($item))
-		$iid = intval($item);
-
-	if(! $iid)
-		return false;
-
-	if(get_iconfig($item, $family, $key) === false) {
-		$r = q("insert into iconfig( iid, cat, k, v, sharing ) values ( %d, '%s', '%s', '%s', %d ) ",
-			intval($iid),
-			dbesc($family),
-			dbesc($key),
-			dbesc($dbvalue),
-			intval($sharing)
-		);
-	}
-	else {
-		$r = q("update iconfig set v = '%s', sharing = %d where iid = %d and cat = '%s' and  k = '%s' ",
-			dbesc($dbvalue),
-			intval($sharing),
-			intval($iid),
-			dbesc($family),
-			dbesc($key)
-		);
-	}
-
-	if(! $r)
-		return false;
-
-	return $value;
+	return Zlib\IConfig::Set($item, $family, $key, $value, $sharing = false);
 }
 
-
-
 function del_iconfig(&$item, $family, $key) {
-
-
-	$is_item = false;
-	$idx = null;
-
-	if(is_array($item)) {
-		$is_item = true;
-		if(is_array($item['iconfig'])) {
-			for($x = 0; $x < count($item['iconfig']); $x ++) {
-				if($item['iconfig'][$x]['cat'] == $family && $item['iconfig'][$x]['k'] == $key) {
-					unset($item['iconfig'][$x]);
-				}
-			}
-		}
-		return true;
-	}
-
-	if(intval($item))
-		$iid = intval($item);
-
-	if(! $iid)
-		return false;
-
-	return q("delete from iconfig where iid = %d and cat = '%s' and  k = '%s' ",
-		intval($iid),
-		dbesc($family),
-		dbesc($key)
-	);
-
+	return Zlib\IConfig::Delete($item, $family, $key);
 }
-
diff --git a/include/connections.php b/include/connections.php
index d18383fad..2d10b8354 100644
--- a/include/connections.php
+++ b/include/connections.php
@@ -590,7 +590,8 @@ function random_profile() {
 
 	for($i = 0; $i < $retryrandom; $i++) {
 
-		$r = q("select xchan_url from xchan left join hubloc on hubloc_hash = xchan_hash where hubloc_connected > %s - interval %s order by $randfunc limit 1",
+		$r = q("select xchan_url from xchan left join hubloc on hubloc_hash = xchan_hash where xchan_addr not like '%s' and hubloc_connected > %s - interval %s order by $randfunc limit 1",
+			dbesc('sys@%'),
 			db_utcnow(), db_quoteinterval('30 day')
 		);
 
diff --git a/include/photos.php b/include/photos.php
index 1cc64f6fa..c64d662ea 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -443,7 +443,7 @@ function photo_upload($channel, $observer, $args) {
  *   * success (bool)
  *   * albums (array)
  */
-function photos_albums_list($channel, $observer) {
+function photos_albums_list($channel, $observer, $sort_key = 'album', $direction = 'asc') {
 
 	$channel_id     = $channel['channel_id'];
 	$observer_xchan = (($observer) ? $observer['xchan_hash'] : '');
@@ -451,11 +451,15 @@ function photos_albums_list($channel, $observer) {
 	if(! perm_is_allowed($channel_id, $observer_xchan, 'view_storage'))
 		return false;
 
-	/** @FIXME create a permissions SQL which works on arbitrary observers and channels, regardless of login or web status */
 
-	$sql_extra = permissions_sql($channel_id);
+	$sql_extra = permissions_sql($channel_id,$observer_xchan);
+
+	$sort_key = dbesc($sort_key);
+	$direction = dbesc($direction);
+
+
 
-	$albums = q("SELECT count( distinct resource_id ) as total, album from photo where uid = %d and photo_usage IN ( %d, %d ) $sql_extra group by album order by max(created) desc",
+	$albums = q("SELECT count( distinct resource_id ) as total, album from photo where uid = %d and photo_usage IN ( %d, %d ) $sql_extra group by album order by $sort_key $direction",
 		intval($channel_id),
 		intval(PHOTO_NORMAL),
 		intval(PHOTO_PROFILE)
@@ -483,20 +487,14 @@ function photos_albums_list($channel, $observer) {
 	return $ret;
 }
 
-function photos_album_widget($channelx,$observer,$albums = null) {
+function photos_album_widget($channelx,$observer,$sortkey = 'album',$direction = 'asc') {
 
 	$o = '';
 
-	// If we weren't passed an album list, see if the photos module
-	// dropped one for us to find in App::$data['albums']. 
-	// If all else fails, load it.
-
-	if(! $albums) {
-		if(array_key_exists('albums', App::$data))
-			$albums = App::$data['albums'];
-		else
-			$albums = photos_albums_list($channelx,$observer);
-	}
+	if(array_key_exists('albums', App::$data))
+		$albums = App::$data['albums'];
+	else
+		$albums = photos_albums_list($channelx,$observer,$sortkey,$direction);
 
 	if($albums['success']) {
 		$o = replace_macros(get_markup_template('photo_albums.tpl'),array(
diff --git a/include/widgets.php b/include/widgets.php
index 3448aeb5e..312b63729 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -799,8 +799,10 @@ function widget_photo_albums($arr) {
 	if((! $channelx) || (! perm_is_allowed(App::$profile['profile_uid'], get_observer_hash(), 'view_storage')))
 		return '';
 	require_once('include/photos.php');
+	$sortkey = ((array_key_exists('sortkey',$arr)) ? $arr['sortkey'] : 'album');
+	$direction = ((array_key_exists('direction',$arr)) ? $arr['direction'] : 'asc');	
 
-	return photos_album_widget($channelx, App::get_observer());
+	return photos_album_widget($channelx, App::get_observer(),$sortkey,$direction);
 }
 
 
@@ -1378,7 +1380,7 @@ function widget_admin($arr) {
 
 	$aside = array(
 		'site'      => array(z_root() . '/admin/site/',     t('Site'),           'site'),
-		'users'     => array(z_root() . '/admin/users/',    t('Accounts'),       'users', 'pending-update', t('Member registrations waiting for confirmation')),
+		'accounts'  => array(z_root() . '/admin/accounts/', t('Accounts'),       'accounts', 'pending-update', t('Member registrations waiting for confirmation')),
 		'channels'  => array(z_root() . '/admin/channels/', t('Channels'),       'channels'),
 		'security'  => array(z_root() . '/admin/security/', t('Security'),       'security'),
 		'features'  => array(z_root() . '/admin/features/', t('Features'),       'features'),
diff --git a/util/addons b/util/addons
index 8fcd40cbc..150a7ca09 100755
--- a/util/addons
+++ b/util/addons
@@ -17,7 +17,6 @@ EOT;
 require_once('include/cli_startup.php');
 
 cli_startup();
-$a = get_app();
 
 	$plugs = get_config('system', 'addon');
 	$plugins_arr = array();
diff --git a/util/safemode b/util/safemode
new file mode 100755
index 000000000..05ddbeafe
--- /dev/null
+++ b/util/safemode
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+if [ $# == 0 ] ; then 
+	echo Usage: $0 on '|' $0 off
+	echo on saves current addons to addons-safemode and uninstalls all of them
+	echo off installs all addons in addons-safemode
+	exit
+fi
+
+
+if [ $1 == 'on' ] ; then
+	util/addons list > addons-safemode
+	for a in `cat addons-safemode` ; do
+		util/addons uninstall $a
+	done
+	exit
+fi
+
+if [ $1 == 'off' ] ; then
+	for a in `cat addons-safemode` ; do
+		util/addons install $a
+	done
+	exit
+fi
+
+
+	
diff --git a/view/es-es/hmessages.po b/view/es-es/hmessages.po
index a5fb83848..65ed7c30f 100644
--- a/view/es-es/hmessages.po
+++ b/view/es-es/hmessages.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Redmatrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-20 00:02-0700\n"
-"PO-Revision-Date: 2016-05-20 09:42+0000\n"
+"POT-Creation-Date: 2016-06-03 00:02-0700\n"
+"PO-Revision-Date: 2016-06-04 10:28+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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "parent"
 msgstr "padre"
 
-#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2632
+#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2605
 msgid "Collection"
 msgstr "Colección"
 
@@ -52,15 +52,15 @@ msgid "Schedule Outbox"
 msgstr "Programar bandeja de salida"
 
 #: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Module/Photos.php:798
-#: ../../Zotlabs/Module/Photos.php:1243 ../../include/widgets.php:1506
-#: ../../include/conversation.php:1037 ../../include/apps.php:441
-#: ../../include/apps.php:516
+#: ../../Zotlabs/Module/Photos.php:1243 ../../Zotlabs/Lib/Apps.php:486
+#: ../../Zotlabs/Lib/Apps.php:561 ../../include/conversation.php:1032
+#: ../../include/widgets.php:1503
 msgid "Unknown"
 msgstr "Desconocido"
 
 #: ../../Zotlabs/Storage/Browser.php:226 ../../Zotlabs/Module/Fbrowser.php:85
-#: ../../include/nav.php:93 ../../include/conversation.php:1645
-#: ../../include/apps.php:167
+#: ../../Zotlabs/Lib/Apps.php:216 ../../include/conversation.php:1639
+#: ../../include/nav.php:93
 msgid "Files"
 msgstr "Ficheros"
 
@@ -72,22 +72,22 @@ msgstr "Total"
 msgid "Shared"
 msgstr "Compartido"
 
-#: ../../Zotlabs/Storage/Browser.php:230 ../../Zotlabs/Storage/Browser.php:305
+#: ../../Zotlabs/Storage/Browser.php:230 ../../Zotlabs/Storage/Browser.php:306
 #: ../../Zotlabs/Module/Blocks.php:156 ../../Zotlabs/Module/Layouts.php:182
 #: ../../Zotlabs/Module/Menu.php:118 ../../Zotlabs/Module/New_channel.php:142
 #: ../../Zotlabs/Module/Webpages.php:186
 msgid "Create"
 msgstr "Crear"
 
-#: ../../Zotlabs/Storage/Browser.php:231 ../../Zotlabs/Storage/Browser.php:307
+#: ../../Zotlabs/Storage/Browser.php:231 ../../Zotlabs/Storage/Browser.php:308
 #: ../../Zotlabs/Module/Cover_photo.php:357
-#: ../../Zotlabs/Module/Photos.php:825 ../../Zotlabs/Module/Photos.php:1367
-#: ../../Zotlabs/Module/Profile_photo.php:368 ../../include/widgets.php:1519
+#: ../../Zotlabs/Module/Photos.php:825 ../../Zotlabs/Module/Photos.php:1368
+#: ../../Zotlabs/Module/Profile_photo.php:368 ../../include/widgets.php:1516
 msgid "Upload"
 msgstr "Subir"
 
-#: ../../Zotlabs/Storage/Browser.php:235 ../../Zotlabs/Module/Admin.php:1208
-#: ../../Zotlabs/Module/Chat.php:245 ../../Zotlabs/Module/Settings.php:592
+#: ../../Zotlabs/Storage/Browser.php:235 ../../Zotlabs/Module/Admin.php:1204
+#: ../../Zotlabs/Module/Chat.php:247 ../../Zotlabs/Module/Settings.php:592
 #: ../../Zotlabs/Module/Settings.php:618
 #: ../../Zotlabs/Module/Sharedwithme.php:99
 msgid "Name"
@@ -98,7 +98,7 @@ msgid "Type"
 msgstr "Tipo"
 
 #: ../../Zotlabs/Storage/Browser.php:237
-#: ../../Zotlabs/Module/Sharedwithme.php:101 ../../include/text.php:1322
+#: ../../Zotlabs/Module/Sharedwithme.php:101 ../../include/text.php:1329
 msgid "Size"
 msgstr "Tamaño"
 
@@ -107,7 +107,7 @@ msgstr "Tamaño"
 msgid "Last Modified"
 msgstr "Última modificación"
 
-#: ../../Zotlabs/Storage/Browser.php:240 ../../Zotlabs/Module/Admin.php:2089
+#: ../../Zotlabs/Storage/Browser.php:240 ../../Zotlabs/Module/Admin.php:2093
 #: ../../Zotlabs/Module/Blocks.php:157
 #: ../../Zotlabs/Module/Connections.php:290
 #: ../../Zotlabs/Module/Connections.php:310
@@ -117,59 +117,60 @@ msgstr "Última modificación"
 #: ../../Zotlabs/Module/Editwebpage.php:146
 #: ../../Zotlabs/Module/Layouts.php:190 ../../Zotlabs/Module/Menu.php:112
 #: ../../Zotlabs/Module/Settings.php:652 ../../Zotlabs/Module/Thing.php:260
-#: ../../Zotlabs/Module/Webpages.php:187 ../../include/identity.php:937
-#: ../../include/identity.php:941 ../../include/ItemObject.php:100
-#: ../../include/menu.php:108 ../../include/page_widgets.php:8
-#: ../../include/page_widgets.php:36 ../../include/apps.php:291
+#: ../../Zotlabs/Module/Webpages.php:187 ../../Zotlabs/Lib/Apps.php:337
+#: ../../Zotlabs/Lib/ThreadItem.php:96 ../../include/channel.php:937
+#: ../../include/channel.php:941 ../../include/menu.php:108
+#: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36
 msgid "Edit"
 msgstr "Editar"
 
-#: ../../Zotlabs/Storage/Browser.php:241 ../../Zotlabs/Module/Admin.php:1043
-#: ../../Zotlabs/Module/Admin.php:1202 ../../Zotlabs/Module/Admin.php:2090
+#: ../../Zotlabs/Storage/Browser.php:241 ../../Zotlabs/Module/Admin.php:1041
+#: ../../Zotlabs/Module/Admin.php:1198 ../../Zotlabs/Module/Admin.php:2094
 #: ../../Zotlabs/Module/Blocks.php:159
 #: ../../Zotlabs/Module/Connections.php:263
-#: ../../Zotlabs/Module/Connedit.php:573
+#: ../../Zotlabs/Module/Connedit.php:572
 #: ../../Zotlabs/Module/Editblock.php:134
 #: ../../Zotlabs/Module/Editlayout.php:136
 #: ../../Zotlabs/Module/Editwebpage.php:170 ../../Zotlabs/Module/Group.php:177
 #: ../../Zotlabs/Module/Photos.php:1173 ../../Zotlabs/Module/Settings.php:653
 #: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Module/Webpages.php:189
-#: ../../include/ItemObject.php:120 ../../include/conversation.php:657
-#: ../../include/apps.php:292
+#: ../../Zotlabs/Lib/Apps.php:338 ../../Zotlabs/Lib/ThreadItem.php:116
+#: ../../include/conversation.php:657
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ../../Zotlabs/Storage/Browser.php:284
+#: ../../Zotlabs/Storage/Browser.php:285
 #, php-format
 msgid "You are using %1$s of your available file storage."
 msgstr "Está usando %1$s de su espacio disponible para ficheros."
 
-#: ../../Zotlabs/Storage/Browser.php:289
+#: ../../Zotlabs/Storage/Browser.php:290
 #, php-format
 msgid "You are using %1$s of %2$s available file storage. (%3$s&#37;)"
 msgstr "Está usando %1$s de %2$s que tiene a su disposición para ficheros. (%3$s&#37;)"
 
-#: ../../Zotlabs/Storage/Browser.php:301
+#: ../../Zotlabs/Storage/Browser.php:302
 msgid "WARNING:"
 msgstr "ATENCIÓN:"
 
-#: ../../Zotlabs/Storage/Browser.php:304
+#: ../../Zotlabs/Storage/Browser.php:305
 msgid "Create new folder"
 msgstr "Crear nueva carpeta"
 
-#: ../../Zotlabs/Storage/Browser.php:306
+#: ../../Zotlabs/Storage/Browser.php:307
 msgid "Upload file"
 msgstr "Subir fichero"
 
-#: ../../Zotlabs/Web/Router.php:65 ../../Zotlabs/Module/Achievements.php:34
-#: ../../Zotlabs/Module/Api.php:13 ../../Zotlabs/Module/Api.php:18
-#: ../../Zotlabs/Module/Appman.php:74 ../../Zotlabs/Module/Authtest.php:16
-#: ../../Zotlabs/Module/Block.php:26 ../../Zotlabs/Module/Block.php:76
-#: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80
-#: ../../Zotlabs/Module/Bookmarks.php:61 ../../Zotlabs/Module/Channel.php:105
-#: ../../Zotlabs/Module/Channel.php:225 ../../Zotlabs/Module/Channel.php:265
-#: ../../Zotlabs/Module/Chat.php:98 ../../Zotlabs/Module/Chat.php:103
-#: ../../Zotlabs/Module/Common.php:39 ../../Zotlabs/Module/Connections.php:33
+#: ../../Zotlabs/Web/Router.php:65 ../../Zotlabs/Web/WebServer.php:121
+#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Api.php:13
+#: ../../Zotlabs/Module/Api.php:18 ../../Zotlabs/Module/Appman.php:75
+#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Block.php:26
+#: ../../Zotlabs/Module/Block.php:76 ../../Zotlabs/Module/Blocks.php:73
+#: ../../Zotlabs/Module/Blocks.php:80 ../../Zotlabs/Module/Bookmarks.php:61
+#: ../../Zotlabs/Module/Channel.php:105 ../../Zotlabs/Module/Channel.php:226
+#: ../../Zotlabs/Module/Channel.php:267 ../../Zotlabs/Module/Chat.php:100
+#: ../../Zotlabs/Module/Chat.php:105 ../../Zotlabs/Module/Common.php:39
+#: ../../Zotlabs/Module/Connections.php:33
 #: ../../Zotlabs/Module/Connedit.php:366
 #: ../../Zotlabs/Module/Cover_photo.php:277
 #: ../../Zotlabs/Module/Cover_photo.php:290
@@ -183,16 +184,15 @@ msgstr "Subir fichero"
 #: ../../Zotlabs/Module/Events.php:265 ../../Zotlabs/Module/Filestorage.php:24
 #: ../../Zotlabs/Module/Filestorage.php:79
 #: ../../Zotlabs/Module/Filestorage.php:94
-#: ../../Zotlabs/Module/Filestorage.php:121
-#: ../../Zotlabs/Module/Fsuggest.php:82 ../../Zotlabs/Module/Group.php:13
+#: ../../Zotlabs/Module/Filestorage.php:121 ../../Zotlabs/Module/Group.php:13
 #: ../../Zotlabs/Module/Id.php:76 ../../Zotlabs/Module/Invite.php:17
 #: ../../Zotlabs/Module/Invite.php:91 ../../Zotlabs/Module/Item.php:210
 #: ../../Zotlabs/Module/Item.php:218 ../../Zotlabs/Module/Item.php:1070
 #: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78
 #: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Like.php:181
-#: ../../Zotlabs/Module/Locs.php:87 ../../Zotlabs/Module/Mail.php:130
+#: ../../Zotlabs/Module/Locs.php:87 ../../Zotlabs/Module/Mail.php:129
 #: ../../Zotlabs/Module/Manage.php:10 ../../Zotlabs/Module/Menu.php:78
-#: ../../Zotlabs/Module/Message.php:20 ../../Zotlabs/Module/Mitem.php:115
+#: ../../Zotlabs/Module/Message.php:18 ../../Zotlabs/Module/Mitem.php:115
 #: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Network.php:17
 #: ../../Zotlabs/Module/New_channel.php:77
 #: ../../Zotlabs/Module/New_channel.php:104
@@ -202,26 +202,26 @@ msgstr "Subir fichero"
 #: ../../Zotlabs/Module/Profile.php:68 ../../Zotlabs/Module/Profile.php:76
 #: ../../Zotlabs/Module/Profile_photo.php:256
 #: ../../Zotlabs/Module/Profile_photo.php:269
-#: ../../Zotlabs/Module/Profiles.php:202 ../../Zotlabs/Module/Profiles.php:600
+#: ../../Zotlabs/Module/Profiles.php:203 ../../Zotlabs/Module/Profiles.php:601
 #: ../../Zotlabs/Module/Rate.php:113 ../../Zotlabs/Module/Register.php:77
 #: ../../Zotlabs/Module/Regmod.php:21
 #: ../../Zotlabs/Module/Service_limits.php:11
-#: ../../Zotlabs/Module/Settings.php:572 ../../Zotlabs/Module/Setup.php:238
+#: ../../Zotlabs/Module/Settings.php:572 ../../Zotlabs/Module/Setup.php:215
 #: ../../Zotlabs/Module/Sharedwithme.php:11
 #: ../../Zotlabs/Module/Sources.php:74 ../../Zotlabs/Module/Suggest.php:30
 #: ../../Zotlabs/Module/Thing.php:274 ../../Zotlabs/Module/Thing.php:294
 #: ../../Zotlabs/Module/Thing.php:331
-#: ../../Zotlabs/Module/Viewconnections.php:26
-#: ../../Zotlabs/Module/Viewconnections.php:31
+#: ../../Zotlabs/Module/Viewconnections.php:25
+#: ../../Zotlabs/Module/Viewconnections.php:30
 #: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Webpages.php:74
-#: ../../include/chat.php:133 ../../include/photos.php:29
+#: ../../Zotlabs/Lib/Chatroom.php:137 ../../include/photos.php:27
 #: ../../include/attach.php:141 ../../include/attach.php:189
 #: ../../include/attach.php:252 ../../include/attach.php:266
 #: ../../include/attach.php:273 ../../include/attach.php:338
 #: ../../include/attach.php:352 ../../include/attach.php:359
 #: ../../include/attach.php:437 ../../include/attach.php:895
 #: ../../include/attach.php:966 ../../include/attach.php:1118
-#: ../../include/items.php:3439 ../../index.php:175
+#: ../../include/items.php:3440
 msgid "Permission denied."
 msgstr "Acceso denegado."
 
@@ -230,18 +230,26 @@ msgid "Not Found"
 msgstr "No encontrado"
 
 #: ../../Zotlabs/Web/Router.php:149 ../../Zotlabs/Module/Block.php:79
-#: ../../Zotlabs/Module/Display.php:121 ../../Zotlabs/Module/Help.php:97
+#: ../../Zotlabs/Module/Display.php:117 ../../Zotlabs/Module/Help.php:97
 #: ../../Zotlabs/Module/Page.php:93
 msgid "Page not found."
 msgstr "Página no encontrada."
 
-#: ../../Zotlabs/Zot/Auth.php:140
+#: ../../Zotlabs/Web/WebServer.php:120 ../../Zotlabs/Module/Dreport.php:10
+#: ../../Zotlabs/Module/Dreport.php:49 ../../Zotlabs/Module/Group.php:72
+#: ../../Zotlabs/Module/Import_items.php:112 ../../Zotlabs/Module/Like.php:284
+#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:62
+#: ../../include/items.php:385
+msgid "Permission denied"
+msgstr "Permiso denegado"
+
+#: ../../Zotlabs/Zot/Auth.php:138
 msgid ""
 "Remote authentication blocked. You are logged into this site locally. Please"
 " logout and retry."
 msgstr "La autenticación desde su servidor está bloqueada. Ha iniciado sesión localmente. Por favor, salga de la sesión y vuelva a intentarlo."
 
-#: ../../Zotlabs/Zot/Auth.php:248 ../../Zotlabs/Module/Openid.php:76
+#: ../../Zotlabs/Zot/Auth.php:246 ../../Zotlabs/Module/Openid.php:76
 #: ../../Zotlabs/Module/Openid.php:183
 #, php-format
 msgid "Welcome %s. Remote authentication successful."
@@ -253,7 +261,7 @@ msgstr "Bienvenido %s. La identificación desde su servidor se ha llevado a cabo
 #: ../../Zotlabs/Module/Editwebpage.php:33
 #: ../../Zotlabs/Module/Filestorage.php:60 ../../Zotlabs/Module/Hcard.php:12
 #: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Profile.php:20
-#: ../../Zotlabs/Module/Webpages.php:34 ../../include/identity.php:837
+#: ../../Zotlabs/Module/Webpages.php:34 ../../include/channel.php:837
 msgid "Requested profile is not available."
 msgstr "El perfil solicitado no está disponible."
 
@@ -273,10 +281,10 @@ msgstr "RSS"
 msgid "Theme settings updated."
 msgstr "Ajustes del tema actualizados."
 
-#: ../../Zotlabs/Module/Admin.php:164 ../../Zotlabs/Module/Admin.php:1239
-#: ../../Zotlabs/Module/Admin.php:1543 ../../Zotlabs/Module/Display.php:44
+#: ../../Zotlabs/Module/Admin.php:164 ../../Zotlabs/Module/Admin.php:1235
+#: ../../Zotlabs/Module/Admin.php:1541 ../../Zotlabs/Module/Display.php:40
 #: ../../Zotlabs/Module/Filestorage.php:33 ../../Zotlabs/Module/Thing.php:89
-#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:3360
+#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:3361
 msgid "Item not found."
 msgstr "Elemento no encontrado."
 
@@ -318,10 +326,10 @@ msgstr "Debe actualizar su software"
 
 #: ../../Zotlabs/Module/Admin.php:241 ../../Zotlabs/Module/Admin.php:490
 #: ../../Zotlabs/Module/Admin.php:711 ../../Zotlabs/Module/Admin.php:755
-#: ../../Zotlabs/Module/Admin.php:1034 ../../Zotlabs/Module/Admin.php:1198
-#: ../../Zotlabs/Module/Admin.php:1313 ../../Zotlabs/Module/Admin.php:1403
-#: ../../Zotlabs/Module/Admin.php:1594 ../../Zotlabs/Module/Admin.php:1628
-#: ../../Zotlabs/Module/Admin.php:1713
+#: ../../Zotlabs/Module/Admin.php:1032 ../../Zotlabs/Module/Admin.php:1194
+#: ../../Zotlabs/Module/Admin.php:1309 ../../Zotlabs/Module/Admin.php:1399
+#: ../../Zotlabs/Module/Admin.php:1592 ../../Zotlabs/Module/Admin.php:1626
+#: ../../Zotlabs/Module/Admin.php:1711
 msgid "Administration"
 msgstr "Administración"
 
@@ -361,7 +369,7 @@ msgstr "Versión del repositorio (dev)"
 msgid "Site settings updated."
 msgstr "Ajustes del sitio actualizados."
 
-#: ../../Zotlabs/Module/Admin.php:400 ../../include/text.php:2853
+#: ../../Zotlabs/Module/Admin.php:400 ../../include/text.php:2826
 msgid "Default"
 msgstr "Predeterminado"
 
@@ -378,7 +386,7 @@ msgid "unsupported"
 msgstr "no soportado"
 
 #: ../../Zotlabs/Module/Admin.php:459 ../../Zotlabs/Module/Api.php:89
-#: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Connedit.php:657
+#: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Connedit.php:654
 #: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:460
 #: ../../Zotlabs/Module/Events.php:469
 #: ../../Zotlabs/Module/Filestorage.php:157
@@ -386,11 +394,11 @@ msgstr "no soportado"
 #: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Mitem.php:158
 #: ../../Zotlabs/Module/Mitem.php:159 ../../Zotlabs/Module/Mitem.php:232
 #: ../../Zotlabs/Module/Mitem.php:233 ../../Zotlabs/Module/Photos.php:666
-#: ../../Zotlabs/Module/Profiles.php:651 ../../Zotlabs/Module/Removeme.php:64
-#: ../../Zotlabs/Module/Settings.php:581 ../../include/dir_fns.php:141
-#: ../../include/dir_fns.php:142 ../../include/dir_fns.php:143
+#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Removeme.php:61
+#: ../../Zotlabs/Module/Settings.php:581 ../../include/dir_fns.php:143
+#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145
 #: ../../view/theme/redbasic/php/config.php:105
-#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1633
+#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1699
 msgid "No"
 msgstr "No"
 
@@ -406,11 +414,11 @@ msgstr "Sí - con aprobación"
 #: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Mitem.php:158
 #: ../../Zotlabs/Module/Mitem.php:159 ../../Zotlabs/Module/Mitem.php:232
 #: ../../Zotlabs/Module/Mitem.php:233 ../../Zotlabs/Module/Photos.php:666
-#: ../../Zotlabs/Module/Profiles.php:651 ../../Zotlabs/Module/Removeme.php:64
-#: ../../Zotlabs/Module/Settings.php:581 ../../include/dir_fns.php:141
-#: ../../include/dir_fns.php:142 ../../include/dir_fns.php:143
+#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Removeme.php:61
+#: ../../Zotlabs/Module/Settings.php:581 ../../include/dir_fns.php:143
+#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145
 #: ../../view/theme/redbasic/php/config.php:105
-#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1633
+#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1699
 msgid "Yes"
 msgstr "Sí"
 
@@ -430,39 +438,38 @@ 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"
 
-#: ../../Zotlabs/Module/Admin.php:491 ../../include/widgets.php:1383
+#: ../../Zotlabs/Module/Admin.php:491 ../../include/widgets.php:1380
 msgid "Site"
 msgstr "Sitio"
 
 #: ../../Zotlabs/Module/Admin.php:492 ../../Zotlabs/Module/Admin.php:688
-#: ../../Zotlabs/Module/Admin.php:771 ../../Zotlabs/Module/Admin.php:1036
-#: ../../Zotlabs/Module/Admin.php:1200 ../../Zotlabs/Module/Admin.php:1405
-#: ../../Zotlabs/Module/Admin.php:1630 ../../Zotlabs/Module/Admin.php:1715
-#: ../../Zotlabs/Module/Admin.php:2092 ../../Zotlabs/Module/Appman.php:125
-#: ../../Zotlabs/Module/Cal.php:341 ../../Zotlabs/Module/Chat.php:194
-#: ../../Zotlabs/Module/Chat.php:236 ../../Zotlabs/Module/Connect.php:98
-#: ../../Zotlabs/Module/Connedit.php:734 ../../Zotlabs/Module/Events.php:475
+#: ../../Zotlabs/Module/Admin.php:771 ../../Zotlabs/Module/Admin.php:1034
+#: ../../Zotlabs/Module/Admin.php:1196 ../../Zotlabs/Module/Admin.php:1401
+#: ../../Zotlabs/Module/Admin.php:1628 ../../Zotlabs/Module/Admin.php:1713
+#: ../../Zotlabs/Module/Admin.php:2096 ../../Zotlabs/Module/Appman.php:126
+#: ../../Zotlabs/Module/Cal.php:338 ../../Zotlabs/Module/Chat.php:196
+#: ../../Zotlabs/Module/Chat.php:238 ../../Zotlabs/Module/Connect.php:98
+#: ../../Zotlabs/Module/Connedit.php:731 ../../Zotlabs/Module/Events.php:475
 #: ../../Zotlabs/Module/Events.php:672
-#: ../../Zotlabs/Module/Filestorage.php:162
-#: ../../Zotlabs/Module/Fsuggest.php:112 ../../Zotlabs/Module/Group.php:85
-#: ../../Zotlabs/Module/Import.php:546
+#: ../../Zotlabs/Module/Filestorage.php:162 ../../Zotlabs/Module/Group.php:85
+#: ../../Zotlabs/Module/Import.php:550
 #: ../../Zotlabs/Module/Import_items.php:120
 #: ../../Zotlabs/Module/Invite.php:146 ../../Zotlabs/Module/Locs.php:121
-#: ../../Zotlabs/Module/Mail.php:384 ../../Zotlabs/Module/Mitem.php:235
+#: ../../Zotlabs/Module/Mail.php:378 ../../Zotlabs/Module/Mitem.php:235
 #: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Pconfig.php:107
 #: ../../Zotlabs/Module/Pdledit.php:66 ../../Zotlabs/Module/Photos.php:677
 #: ../../Zotlabs/Module/Photos.php:1052 ../../Zotlabs/Module/Photos.php:1092
 #: ../../Zotlabs/Module/Photos.php:1210 ../../Zotlabs/Module/Poke.php:186
-#: ../../Zotlabs/Module/Profiles.php:691 ../../Zotlabs/Module/Rate.php:170
+#: ../../Zotlabs/Module/Profiles.php:687 ../../Zotlabs/Module/Rate.php:170
 #: ../../Zotlabs/Module/Settings.php:590 ../../Zotlabs/Module/Settings.php:703
 #: ../../Zotlabs/Module/Settings.php:731 ../../Zotlabs/Module/Settings.php:754
 #: ../../Zotlabs/Module/Settings.php:842
-#: ../../Zotlabs/Module/Settings.php:1034 ../../Zotlabs/Module/Setup.php:335
-#: ../../Zotlabs/Module/Setup.php:376 ../../Zotlabs/Module/Sources.php:114
+#: ../../Zotlabs/Module/Settings.php:1034 ../../Zotlabs/Module/Setup.php:312
+#: ../../Zotlabs/Module/Setup.php:353 ../../Zotlabs/Module/Sources.php:114
 #: ../../Zotlabs/Module/Sources.php:149 ../../Zotlabs/Module/Thing.php:316
 #: ../../Zotlabs/Module/Thing.php:362 ../../Zotlabs/Module/Xchan.php:15
-#: ../../include/widgets.php:757 ../../include/widgets.php:769
-#: ../../include/ItemObject.php:703 ../../include/js_strings.php:22
+#: ../../Zotlabs/Lib/ThreadItem.php:699 ../../include/widgets.php:757
+#: ../../include/widgets.php:769 ../../include/js_strings.php:22
 #: ../../view/theme/redbasic/php/config.php:99
 msgid "Submit"
 msgstr "Enviar"
@@ -479,7 +486,7 @@ msgstr "Subir fichero"
 msgid "Policies"
 msgstr "Políticas"
 
-#: ../../Zotlabs/Module/Admin.php:496 ../../include/contact_widgets.php:19
+#: ../../Zotlabs/Module/Admin.php:496 ../../include/contact_widgets.php:16
 msgid "Advanced"
 msgstr "Avanzado"
 
@@ -773,7 +780,7 @@ msgstr "Gestionar las funcionalidades"
 msgid "No server found"
 msgstr "Servidor no encontrado"
 
-#: ../../Zotlabs/Module/Admin.php:710 ../../Zotlabs/Module/Admin.php:1048
+#: ../../Zotlabs/Module/Admin.php:710 ../../Zotlabs/Module/Admin.php:1046
 msgid "ID"
 msgstr "ID"
 
@@ -797,7 +804,7 @@ msgstr "Servidor"
 msgid ""
 "By default, unfiltered HTML is allowed in embedded media. This is inherently"
 " insecure."
-msgstr "De forma predeterminada, el HTML sin filtrar está permitido en los medios incorporados en una publicación. Esto es siempre inseguro."
+msgstr "De forma predeterminada, el HTML sin filtrar está permitido en el contenido multimedia incorporado en una publicación. Esto es siempre inseguro."
 
 #: ../../Zotlabs/Module/Admin.php:749
 msgid ""
@@ -817,7 +824,7 @@ msgid ""
 "embedded content from that site is explicitly blocked."
 msgstr "El resto del contenido incrustado se filtrará, <strong>excepto</ strong> si el contenido incorporado desde ese sitio está bloqueado de forma explícita."
 
-#: ../../Zotlabs/Module/Admin.php:756 ../../include/widgets.php:1386
+#: ../../Zotlabs/Module/Admin.php:756 ../../include/widgets.php:1383
 msgid "Security"
 msgstr "Seguridad"
 
@@ -869,7 +876,7 @@ msgstr "Bloquear la comunicación desde estos canales"
 
 #: ../../Zotlabs/Module/Admin.php:765
 msgid "Only allow embeds from secure (SSL) websites and links."
-msgstr "Sólo se permite contenido incorporado desde sitios y enlaces seguros (SSL)."
+msgstr "Sólo se permite contenido multimedia incorporado desde sitios y enlaces seguros (SSL)."
 
 #: ../../Zotlabs/Module/Admin.php:766
 msgid "Allow unfiltered embedded HTML content only from these domains"
@@ -958,447 +965,447 @@ msgid_plural "%s account blocked/unblocked"
 msgstr[0] "%s cuenta bloqueada/desbloqueada"
 msgstr[1] "%s cuenta bloqueada/desbloqueada"
 
-#: ../../Zotlabs/Module/Admin.php:909
+#: ../../Zotlabs/Module/Admin.php:908
 #, php-format
 msgid "%s account deleted"
 msgid_plural "%s accounts deleted"
 msgstr[0] "%s cuentas eliminadas"
 msgstr[1] "%s cuentas eliminadas"
 
-#: ../../Zotlabs/Module/Admin.php:945
+#: ../../Zotlabs/Module/Admin.php:944
 msgid "Account not found"
 msgstr "Cuenta no encontrada"
 
-#: ../../Zotlabs/Module/Admin.php:957
+#: ../../Zotlabs/Module/Admin.php:955
 #, php-format
 msgid "Account '%s' deleted"
 msgstr "La cuenta '%s' ha sido eliminada"
 
-#: ../../Zotlabs/Module/Admin.php:965
+#: ../../Zotlabs/Module/Admin.php:963
 #, php-format
 msgid "Account '%s' blocked"
 msgstr "La cuenta '%s' ha sido bloqueada"
 
-#: ../../Zotlabs/Module/Admin.php:973
+#: ../../Zotlabs/Module/Admin.php:971
 #, php-format
 msgid "Account '%s' unblocked"
 msgstr "La cuenta '%s' ha sido desbloqueada"
 
-#: ../../Zotlabs/Module/Admin.php:1035 ../../Zotlabs/Module/Admin.php:1047
+#: ../../Zotlabs/Module/Admin.php:1033 ../../Zotlabs/Module/Admin.php:1045
 msgid "Users"
 msgstr "Usuarios"
 
-#: ../../Zotlabs/Module/Admin.php:1037 ../../Zotlabs/Module/Admin.php:1201
+#: ../../Zotlabs/Module/Admin.php:1035 ../../Zotlabs/Module/Admin.php:1197
 msgid "select all"
 msgstr "seleccionar todo"
 
-#: ../../Zotlabs/Module/Admin.php:1038
+#: ../../Zotlabs/Module/Admin.php:1036
 msgid "User registrations waiting for confirm"
 msgstr "Registros de usuario en espera de aprobación"
 
-#: ../../Zotlabs/Module/Admin.php:1039
+#: ../../Zotlabs/Module/Admin.php:1037
 msgid "Request date"
 msgstr "Fecha de solicitud"
 
-#: ../../Zotlabs/Module/Admin.php:1039 ../../Zotlabs/Module/Admin.php:1048
+#: ../../Zotlabs/Module/Admin.php:1037 ../../Zotlabs/Module/Admin.php:1046
 #: ../../Zotlabs/Module/Id.php:17 ../../Zotlabs/Module/Id.php:18
-#: ../../include/contact_selectors.php:81 ../../boot.php:1631
+#: ../../include/network.php:2151 ../../boot.php:1697
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: ../../Zotlabs/Module/Admin.php:1040
+#: ../../Zotlabs/Module/Admin.php:1038
 msgid "No registrations."
 msgstr "Sin registros."
 
-#: ../../Zotlabs/Module/Admin.php:1041
+#: ../../Zotlabs/Module/Admin.php:1039
 #: ../../Zotlabs/Module/Connections.php:275
 msgid "Approve"
 msgstr "Aprobar"
 
-#: ../../Zotlabs/Module/Admin.php:1042
+#: ../../Zotlabs/Module/Admin.php:1040
 msgid "Deny"
 msgstr "Rechazar"
 
-#: ../../Zotlabs/Module/Admin.php:1044 ../../Zotlabs/Module/Connedit.php:541
+#: ../../Zotlabs/Module/Admin.php:1042 ../../Zotlabs/Module/Connedit.php:540
 msgid "Block"
 msgstr "Bloquear"
 
-#: ../../Zotlabs/Module/Admin.php:1045 ../../Zotlabs/Module/Connedit.php:541
+#: ../../Zotlabs/Module/Admin.php:1043 ../../Zotlabs/Module/Connedit.php:540
 msgid "Unblock"
 msgstr "Desbloquear"
 
-#: ../../Zotlabs/Module/Admin.php:1048 ../../include/group.php:267
+#: ../../Zotlabs/Module/Admin.php:1046 ../../include/group.php:267
 msgid "All Channels"
 msgstr "Todos los canales"
 
-#: ../../Zotlabs/Module/Admin.php:1048
+#: ../../Zotlabs/Module/Admin.php:1046
 msgid "Register date"
 msgstr "Fecha de registro"
 
-#: ../../Zotlabs/Module/Admin.php:1048
+#: ../../Zotlabs/Module/Admin.php:1046
 msgid "Last login"
 msgstr "Último acceso"
 
-#: ../../Zotlabs/Module/Admin.php:1048
+#: ../../Zotlabs/Module/Admin.php:1046
 msgid "Expires"
 msgstr "Caduca"
 
-#: ../../Zotlabs/Module/Admin.php:1048
+#: ../../Zotlabs/Module/Admin.php:1046
 msgid "Service Class"
 msgstr "Clase de servicio"
 
-#: ../../Zotlabs/Module/Admin.php:1050
+#: ../../Zotlabs/Module/Admin.php:1048
 msgid ""
 "Selected accounts will be deleted!\\n\\nEverything these accounts had posted"
 " on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "¡Las cuentas seleccionadas van a ser eliminadas!\\n\\n¡Todo lo que estas cuentas han publicado en este sitio será borrado de forma permanente!\\n\\n¿Está seguro de querer hacerlo?"
 
-#: ../../Zotlabs/Module/Admin.php:1051
+#: ../../Zotlabs/Module/Admin.php:1049
 msgid ""
 "The account {0} will be deleted!\\n\\nEverything this account has posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "¡La cuenta {0} va a ser eliminada!\\n\\n¡Todo lo que esta cuenta ha publicado en este sitio será borrado de forma permanente!\\n\\n¿Está seguro de querer hacerlo?"
 
-#: ../../Zotlabs/Module/Admin.php:1087
+#: ../../Zotlabs/Module/Admin.php:1085
 #, php-format
 msgid "%s channel censored/uncensored"
 msgid_plural "%s channels censored/uncensored"
 msgstr[0] "%s canales censurados/no censurados"
 msgstr[1] "%s canales censurados/no censurados"
 
-#: ../../Zotlabs/Module/Admin.php:1096
+#: ../../Zotlabs/Module/Admin.php:1094
 #, php-format
 msgid "%s channel code allowed/disallowed"
 msgid_plural "%s channels code allowed/disallowed"
 msgstr[0] "%s código permitido/no permitido al canal"
 msgstr[1] "%s código permitido/no permitido al canal"
 
-#: ../../Zotlabs/Module/Admin.php:1103
+#: ../../Zotlabs/Module/Admin.php:1100
 #, php-format
 msgid "%s channel deleted"
 msgid_plural "%s channels deleted"
 msgstr[0] "%s canales eliminados"
 msgstr[1] "%s canales eliminados"
 
-#: ../../Zotlabs/Module/Admin.php:1123
+#: ../../Zotlabs/Module/Admin.php:1120
 msgid "Channel not found"
 msgstr "Canal no encontrado"
 
-#: ../../Zotlabs/Module/Admin.php:1134
+#: ../../Zotlabs/Module/Admin.php:1130
 #, php-format
 msgid "Channel '%s' deleted"
 msgstr "Canal '%s' eliminado"
 
-#: ../../Zotlabs/Module/Admin.php:1146
+#: ../../Zotlabs/Module/Admin.php:1142
 #, php-format
 msgid "Channel '%s' censored"
 msgstr "Canal '%s' censurado"
 
-#: ../../Zotlabs/Module/Admin.php:1146
+#: ../../Zotlabs/Module/Admin.php:1142
 #, php-format
 msgid "Channel '%s' uncensored"
 msgstr "Canal '%s' no censurado"
 
-#: ../../Zotlabs/Module/Admin.php:1157
+#: ../../Zotlabs/Module/Admin.php:1153
 #, php-format
 msgid "Channel '%s' code allowed"
 msgstr "Código permitido al canal '%s'"
 
-#: ../../Zotlabs/Module/Admin.php:1157
+#: ../../Zotlabs/Module/Admin.php:1153
 #, php-format
 msgid "Channel '%s' code disallowed"
 msgstr "Código no permitido al canal '%s'"
 
-#: ../../Zotlabs/Module/Admin.php:1199 ../../include/widgets.php:1385
+#: ../../Zotlabs/Module/Admin.php:1195 ../../include/widgets.php:1382
 msgid "Channels"
 msgstr "Canales"
 
-#: ../../Zotlabs/Module/Admin.php:1203
+#: ../../Zotlabs/Module/Admin.php:1199
 msgid "Censor"
 msgstr "Censurar"
 
-#: ../../Zotlabs/Module/Admin.php:1204
+#: ../../Zotlabs/Module/Admin.php:1200
 msgid "Uncensor"
 msgstr "No censurar"
 
-#: ../../Zotlabs/Module/Admin.php:1205
+#: ../../Zotlabs/Module/Admin.php:1201
 msgid "Allow Code"
 msgstr "Permitir código"
 
-#: ../../Zotlabs/Module/Admin.php:1206
+#: ../../Zotlabs/Module/Admin.php:1202
 msgid "Disallow Code"
 msgstr "No permitir código"
 
-#: ../../Zotlabs/Module/Admin.php:1207 ../../include/conversation.php:1617
+#: ../../Zotlabs/Module/Admin.php:1203 ../../include/conversation.php:1611
 msgid "Channel"
 msgstr "Canal"
 
-#: ../../Zotlabs/Module/Admin.php:1208
+#: ../../Zotlabs/Module/Admin.php:1204
 msgid "UID"
 msgstr "UID"
 
-#: ../../Zotlabs/Module/Admin.php:1208 ../../Zotlabs/Module/Locs.php:118
-#: ../../Zotlabs/Module/Profiles.php:469
+#: ../../Zotlabs/Module/Admin.php:1204 ../../Zotlabs/Module/Locs.php:118
+#: ../../Zotlabs/Module/Profiles.php:470
 msgid "Address"
 msgstr "Dirección"
 
-#: ../../Zotlabs/Module/Admin.php:1210
+#: ../../Zotlabs/Module/Admin.php:1206
 msgid ""
 "Selected channels will be deleted!\\n\\nEverything that was posted in these "
 "channels on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Los canales seleccionados se eliminarán!\\n\\nTodo lo publicado por estos canales en este sitio se borrarán definitivamente!\\n\\n¿Está seguro de querer hacerlo?"
 
-#: ../../Zotlabs/Module/Admin.php:1211
+#: ../../Zotlabs/Module/Admin.php:1207
 msgid ""
 "The channel {0} will be deleted!\\n\\nEverything that was posted in this "
 "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?"
 
-#: ../../Zotlabs/Module/Admin.php:1268
+#: ../../Zotlabs/Module/Admin.php:1264
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "Extensión %s desactivada."
 
-#: ../../Zotlabs/Module/Admin.php:1272
+#: ../../Zotlabs/Module/Admin.php:1268
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "Extensión %s activada."
 
-#: ../../Zotlabs/Module/Admin.php:1282 ../../Zotlabs/Module/Admin.php:1567
+#: ../../Zotlabs/Module/Admin.php:1278 ../../Zotlabs/Module/Admin.php:1565
 msgid "Disable"
 msgstr "Desactivar"
 
-#: ../../Zotlabs/Module/Admin.php:1285 ../../Zotlabs/Module/Admin.php:1569
+#: ../../Zotlabs/Module/Admin.php:1281 ../../Zotlabs/Module/Admin.php:1567
 msgid "Enable"
 msgstr "Activar"
 
-#: ../../Zotlabs/Module/Admin.php:1314 ../../Zotlabs/Module/Admin.php:1404
-#: ../../include/widgets.php:1388
+#: ../../Zotlabs/Module/Admin.php:1310 ../../Zotlabs/Module/Admin.php:1400
+#: ../../include/widgets.php:1385
 msgid "Plugins"
 msgstr "Extensiones (plugins)"
 
-#: ../../Zotlabs/Module/Admin.php:1315 ../../Zotlabs/Module/Admin.php:1596
+#: ../../Zotlabs/Module/Admin.php:1311 ../../Zotlabs/Module/Admin.php:1594
 msgid "Toggle"
 msgstr "Cambiar"
 
-#: ../../Zotlabs/Module/Admin.php:1316 ../../Zotlabs/Module/Admin.php:1597
-#: ../../include/widgets.php:638 ../../include/nav.php:208
-#: ../../include/apps.php:166
+#: ../../Zotlabs/Module/Admin.php:1312 ../../Zotlabs/Module/Admin.php:1595
+#: ../../Zotlabs/Lib/Apps.php:215 ../../include/nav.php:208
+#: ../../include/widgets.php:638
 msgid "Settings"
 msgstr "Ajustes"
 
-#: ../../Zotlabs/Module/Admin.php:1323 ../../Zotlabs/Module/Admin.php:1606
+#: ../../Zotlabs/Module/Admin.php:1319 ../../Zotlabs/Module/Admin.php:1604
 msgid "Author: "
 msgstr "Autor:"
 
-#: ../../Zotlabs/Module/Admin.php:1324 ../../Zotlabs/Module/Admin.php:1607
+#: ../../Zotlabs/Module/Admin.php:1320 ../../Zotlabs/Module/Admin.php:1605
 msgid "Maintainer: "
 msgstr "Mantenedor:"
 
-#: ../../Zotlabs/Module/Admin.php:1325
+#: ../../Zotlabs/Module/Admin.php:1321
 msgid "Minimum project version: "
 msgstr "Versión mínima del proyecto:"
 
-#: ../../Zotlabs/Module/Admin.php:1326
+#: ../../Zotlabs/Module/Admin.php:1322
 msgid "Maximum project version: "
 msgstr "Versión máxima del proyecto:"
 
-#: ../../Zotlabs/Module/Admin.php:1327
+#: ../../Zotlabs/Module/Admin.php:1323
 msgid "Minimum PHP version: "
 msgstr "Versión mínima de PHP:"
 
-#: ../../Zotlabs/Module/Admin.php:1328
+#: ../../Zotlabs/Module/Admin.php:1324
 msgid "Requires: "
 msgstr "Se requiere:"
 
-#: ../../Zotlabs/Module/Admin.php:1329 ../../Zotlabs/Module/Admin.php:1409
+#: ../../Zotlabs/Module/Admin.php:1325 ../../Zotlabs/Module/Admin.php:1405
 msgid "Disabled - version incompatibility"
 msgstr "Deshabilitado - versiones incompatibles"
 
-#: ../../Zotlabs/Module/Admin.php:1378
+#: ../../Zotlabs/Module/Admin.php:1374
 msgid "Enter the public git repository URL of the plugin repo."
 msgstr "Escriba la URL pública del repositorio git del plugin."
 
-#: ../../Zotlabs/Module/Admin.php:1379
+#: ../../Zotlabs/Module/Admin.php:1375
 msgid "Plugin repo git URL"
 msgstr "URL del repositorio git del plugin"
 
-#: ../../Zotlabs/Module/Admin.php:1380
+#: ../../Zotlabs/Module/Admin.php:1376
 msgid "Custom repo name"
 msgstr "Nombre personalizado del repositorio"
 
-#: ../../Zotlabs/Module/Admin.php:1380
+#: ../../Zotlabs/Module/Admin.php:1376
 msgid "(optional)"
 msgstr "(opcional)"
 
-#: ../../Zotlabs/Module/Admin.php:1381
+#: ../../Zotlabs/Module/Admin.php:1377
 msgid "Download Plugin Repo"
 msgstr "Descargar el repositorio"
 
-#: ../../Zotlabs/Module/Admin.php:1388
+#: ../../Zotlabs/Module/Admin.php:1384
 msgid "Install new repo"
 msgstr "Instalar un nuevo repositorio"
 
-#: ../../Zotlabs/Module/Admin.php:1389 ../../include/apps.php:284
+#: ../../Zotlabs/Module/Admin.php:1385 ../../Zotlabs/Lib/Apps.php:330
 msgid "Install"
 msgstr "Instalar"
 
-#: ../../Zotlabs/Module/Admin.php:1390 ../../Zotlabs/Module/Fbrowser.php:66
+#: ../../Zotlabs/Module/Admin.php:1386 ../../Zotlabs/Module/Fbrowser.php:66
 #: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Settings.php:591
 #: ../../Zotlabs/Module/Settings.php:617 ../../Zotlabs/Module/Tagrm.php:15
-#: ../../Zotlabs/Module/Tagrm.php:138 ../../include/conversation.php:1265
+#: ../../Zotlabs/Module/Tagrm.php:138 ../../include/conversation.php:1259
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../../Zotlabs/Module/Admin.php:1411
+#: ../../Zotlabs/Module/Admin.php:1407
 msgid "Manage Repos"
 msgstr "Gestionar los repositorios"
 
-#: ../../Zotlabs/Module/Admin.php:1412
+#: ../../Zotlabs/Module/Admin.php:1408
 msgid "Installed Plugin Repositories"
 msgstr "Repositorios de los plugins instalados"
 
-#: ../../Zotlabs/Module/Admin.php:1413
+#: ../../Zotlabs/Module/Admin.php:1409
 msgid "Install a New Plugin Repository"
 msgstr "Instalar un nuevo repositorio de plugins"
 
-#: ../../Zotlabs/Module/Admin.php:1419 ../../Zotlabs/Module/Settings.php:77
-#: ../../Zotlabs/Module/Settings.php:616 ../../include/apps.php:284
+#: ../../Zotlabs/Module/Admin.php:1415 ../../Zotlabs/Module/Settings.php:77
+#: ../../Zotlabs/Module/Settings.php:616 ../../Zotlabs/Lib/Apps.php:330
 msgid "Update"
 msgstr "Actualizar"
 
-#: ../../Zotlabs/Module/Admin.php:1420
+#: ../../Zotlabs/Module/Admin.php:1416
 msgid "Switch branch"
 msgstr "Cambiar la rama"
 
-#: ../../Zotlabs/Module/Admin.php:1421 ../../Zotlabs/Module/Photos.php:998
+#: ../../Zotlabs/Module/Admin.php:1417 ../../Zotlabs/Module/Photos.php:998
 #: ../../Zotlabs/Module/Tagrm.php:137
 msgid "Remove"
 msgstr "Eliminar"
 
-#: ../../Zotlabs/Module/Admin.php:1532
+#: ../../Zotlabs/Module/Admin.php:1530
 msgid "No themes found."
 msgstr "No se han encontrado temas."
 
-#: ../../Zotlabs/Module/Admin.php:1588
+#: ../../Zotlabs/Module/Admin.php:1586
 msgid "Screenshot"
 msgstr "Instantánea de pantalla"
 
-#: ../../Zotlabs/Module/Admin.php:1595 ../../Zotlabs/Module/Admin.php:1629
-#: ../../include/widgets.php:1389
+#: ../../Zotlabs/Module/Admin.php:1593 ../../Zotlabs/Module/Admin.php:1627
+#: ../../include/widgets.php:1386
 msgid "Themes"
 msgstr "Temas"
 
-#: ../../Zotlabs/Module/Admin.php:1634
+#: ../../Zotlabs/Module/Admin.php:1632
 msgid "[Experimental]"
 msgstr "[Experimental]"
 
-#: ../../Zotlabs/Module/Admin.php:1635
+#: ../../Zotlabs/Module/Admin.php:1633
 msgid "[Unsupported]"
 msgstr "[No soportado]"
 
-#: ../../Zotlabs/Module/Admin.php:1659
+#: ../../Zotlabs/Module/Admin.php:1657
 msgid "Log settings updated."
 msgstr "Actualizado el informe de configuraciones."
 
-#: ../../Zotlabs/Module/Admin.php:1714 ../../include/widgets.php:1410
-#: ../../include/widgets.php:1420
+#: ../../Zotlabs/Module/Admin.php:1712 ../../include/widgets.php:1407
+#: ../../include/widgets.php:1417
 msgid "Logs"
 msgstr "Informes"
 
-#: ../../Zotlabs/Module/Admin.php:1716
+#: ../../Zotlabs/Module/Admin.php:1714
 msgid "Clear"
 msgstr "Vaciar"
 
-#: ../../Zotlabs/Module/Admin.php:1722
+#: ../../Zotlabs/Module/Admin.php:1720
 msgid "Debugging"
 msgstr "Depuración"
 
-#: ../../Zotlabs/Module/Admin.php:1723
+#: ../../Zotlabs/Module/Admin.php:1721
 msgid "Log file"
 msgstr "Fichero de informe"
 
-#: ../../Zotlabs/Module/Admin.php:1723
+#: ../../Zotlabs/Module/Admin.php:1721
 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."
 
-#: ../../Zotlabs/Module/Admin.php:1724
+#: ../../Zotlabs/Module/Admin.php:1722
 msgid "Log level"
 msgstr "Nivel de depuración"
 
-#: ../../Zotlabs/Module/Admin.php:2004
+#: ../../Zotlabs/Module/Admin.php:2008
 msgid "New Profile Field"
 msgstr "Nuevo campo en el perfil"
 
-#: ../../Zotlabs/Module/Admin.php:2005 ../../Zotlabs/Module/Admin.php:2025
+#: ../../Zotlabs/Module/Admin.php:2009 ../../Zotlabs/Module/Admin.php:2029
 msgid "Field nickname"
 msgstr "Alias del campo"
 
-#: ../../Zotlabs/Module/Admin.php:2005 ../../Zotlabs/Module/Admin.php:2025
+#: ../../Zotlabs/Module/Admin.php:2009 ../../Zotlabs/Module/Admin.php:2029
 msgid "System name of field"
 msgstr "Nombre del campo en el sistema"
 
-#: ../../Zotlabs/Module/Admin.php:2006 ../../Zotlabs/Module/Admin.php:2026
+#: ../../Zotlabs/Module/Admin.php:2010 ../../Zotlabs/Module/Admin.php:2030
 msgid "Input type"
 msgstr "Tipo de entrada"
 
-#: ../../Zotlabs/Module/Admin.php:2007 ../../Zotlabs/Module/Admin.php:2027
+#: ../../Zotlabs/Module/Admin.php:2011 ../../Zotlabs/Module/Admin.php:2031
 msgid "Field Name"
 msgstr "Nombre del campo"
 
-#: ../../Zotlabs/Module/Admin.php:2007 ../../Zotlabs/Module/Admin.php:2027
+#: ../../Zotlabs/Module/Admin.php:2011 ../../Zotlabs/Module/Admin.php:2031
 msgid "Label on profile pages"
 msgstr "Etiqueta a mostrar en la página del perfil"
 
-#: ../../Zotlabs/Module/Admin.php:2008 ../../Zotlabs/Module/Admin.php:2028
+#: ../../Zotlabs/Module/Admin.php:2012 ../../Zotlabs/Module/Admin.php:2032
 msgid "Help text"
 msgstr "Texto de ayuda"
 
-#: ../../Zotlabs/Module/Admin.php:2008 ../../Zotlabs/Module/Admin.php:2028
+#: ../../Zotlabs/Module/Admin.php:2012 ../../Zotlabs/Module/Admin.php:2032
 msgid "Additional info (optional)"
 msgstr "Información adicional (opcional)"
 
-#: ../../Zotlabs/Module/Admin.php:2009 ../../Zotlabs/Module/Admin.php:2029
+#: ../../Zotlabs/Module/Admin.php:2013 ../../Zotlabs/Module/Admin.php:2033
 #: ../../Zotlabs/Module/Filer.php:53 ../../Zotlabs/Module/Rbmark.php:32
 #: ../../Zotlabs/Module/Rbmark.php:104 ../../include/widgets.php:201
-#: ../../include/text.php:934 ../../include/text.php:946
+#: ../../include/text.php:946 ../../include/text.php:958
 msgid "Save"
 msgstr "Guardar"
 
-#: ../../Zotlabs/Module/Admin.php:2018
+#: ../../Zotlabs/Module/Admin.php:2022
 msgid "Field definition not found"
 msgstr "Definición del campo no encontrada"
 
-#: ../../Zotlabs/Module/Admin.php:2024
+#: ../../Zotlabs/Module/Admin.php:2028
 msgid "Edit Profile Field"
 msgstr "Modificar el campo del perfil"
 
-#: ../../Zotlabs/Module/Admin.php:2082 ../../include/widgets.php:1391
+#: ../../Zotlabs/Module/Admin.php:2086 ../../include/widgets.php:1388
 msgid "Profile Fields"
 msgstr "Campos del perfil"
 
-#: ../../Zotlabs/Module/Admin.php:2083
+#: ../../Zotlabs/Module/Admin.php:2087
 msgid "Basic Profile Fields"
 msgstr "Campos básicos del perfil"
 
-#: ../../Zotlabs/Module/Admin.php:2084
+#: ../../Zotlabs/Module/Admin.php:2088
 msgid "Advanced Profile Fields"
 msgstr "Campos avanzados del perfil"
 
-#: ../../Zotlabs/Module/Admin.php:2084
+#: ../../Zotlabs/Module/Admin.php:2088
 msgid "(In addition to basic fields)"
 msgstr "(Además de los campos básicos)"
 
-#: ../../Zotlabs/Module/Admin.php:2086
+#: ../../Zotlabs/Module/Admin.php:2090
 msgid "All available fields"
 msgstr "Todos los campos disponibles"
 
-#: ../../Zotlabs/Module/Admin.php:2087
+#: ../../Zotlabs/Module/Admin.php:2091
 msgid "Custom Fields"
 msgstr "Campos personalizados"
 
-#: ../../Zotlabs/Module/Admin.php:2091
+#: ../../Zotlabs/Module/Admin.php:2095
 msgid "Create Custom Field"
 msgstr "Crear un campo personalizado"
 
@@ -1420,72 +1427,72 @@ msgid ""
 " and/or create new posts for you?"
 msgstr "¿Desea autorizar a esta aplicación a acceder a sus publicaciones y contactos, y/o crear nuevas publicaciones por usted?"
 
-#: ../../Zotlabs/Module/Appman.php:36 ../../Zotlabs/Module/Appman.php:52
+#: ../../Zotlabs/Module/Appman.php:37 ../../Zotlabs/Module/Appman.php:53
 msgid "App installed."
 msgstr "Aplicación instalada."
 
-#: ../../Zotlabs/Module/Appman.php:45
+#: ../../Zotlabs/Module/Appman.php:46
 msgid "Malformed app."
 msgstr "Aplicación con errores"
 
-#: ../../Zotlabs/Module/Appman.php:103
+#: ../../Zotlabs/Module/Appman.php:104
 msgid "Embed code"
 msgstr "Código incorporado"
 
-#: ../../Zotlabs/Module/Appman.php:109 ../../include/widgets.php:107
+#: ../../Zotlabs/Module/Appman.php:110 ../../include/widgets.php:107
 msgid "Edit App"
 msgstr "Modificar la aplicación"
 
-#: ../../Zotlabs/Module/Appman.php:109
+#: ../../Zotlabs/Module/Appman.php:110
 msgid "Create App"
 msgstr "Crear una aplicación"
 
-#: ../../Zotlabs/Module/Appman.php:114
+#: ../../Zotlabs/Module/Appman.php:115
 msgid "Name of app"
 msgstr "Nombre de la aplicación"
 
-#: ../../Zotlabs/Module/Appman.php:114 ../../Zotlabs/Module/Appman.php:115
+#: ../../Zotlabs/Module/Appman.php:115 ../../Zotlabs/Module/Appman.php:116
 #: ../../Zotlabs/Module/Events.php:449 ../../Zotlabs/Module/Events.php:454
-#: ../../Zotlabs/Module/Profiles.php:713 ../../Zotlabs/Module/Profiles.php:717
-#: ../../include/datetime.php:246
+#: ../../Zotlabs/Module/Profiles.php:709 ../../Zotlabs/Module/Profiles.php:713
+#: ../../include/datetime.php:245
 msgid "Required"
 msgstr "Obligatorio"
 
-#: ../../Zotlabs/Module/Appman.php:115
+#: ../../Zotlabs/Module/Appman.php:116
 msgid "Location (URL) of app"
 msgstr "Dirección (URL) de la aplicación"
 
-#: ../../Zotlabs/Module/Appman.php:116 ../../Zotlabs/Module/Events.php:462
+#: ../../Zotlabs/Module/Appman.php:117 ../../Zotlabs/Module/Events.php:462
 #: ../../Zotlabs/Module/Rbmark.php:101
 msgid "Description"
 msgstr "Descripción"
 
-#: ../../Zotlabs/Module/Appman.php:117
+#: ../../Zotlabs/Module/Appman.php:118
 msgid "Photo icon URL"
 msgstr "Dirección del icono"
 
-#: ../../Zotlabs/Module/Appman.php:117
+#: ../../Zotlabs/Module/Appman.php:118
 msgid "80 x 80 pixels - optional"
 msgstr "80 x 80 pixels - opcional"
 
-#: ../../Zotlabs/Module/Appman.php:118
+#: ../../Zotlabs/Module/Appman.php:119
 msgid "Categories (optional, comma separated list)"
 msgstr "Categorías (opcional, lista separada por comas)"
 
-#: ../../Zotlabs/Module/Appman.php:119
+#: ../../Zotlabs/Module/Appman.php:120
 msgid "Version ID"
 msgstr "Versión"
 
-#: ../../Zotlabs/Module/Appman.php:120
+#: ../../Zotlabs/Module/Appman.php:121
 msgid "Price of app"
 msgstr "Precio de la aplicación"
 
-#: ../../Zotlabs/Module/Appman.php:121
+#: ../../Zotlabs/Module/Appman.php:122
 msgid "Location (URL) to purchase app"
 msgstr "Dirección (URL) donde adquirir la aplicación"
 
-#: ../../Zotlabs/Module/Apps.php:46 ../../include/widgets.php:102
-#: ../../include/nav.php:163
+#: ../../Zotlabs/Module/Apps.php:47 ../../include/nav.php:163
+#: ../../include/widgets.php:102
 msgid "Apps"
 msgstr "Aplicaciones (apps)"
 
@@ -1497,7 +1504,7 @@ msgstr "Elemento no disponible"
 msgid "Invalid item."
 msgstr "Elemento no válido."
 
-#: ../../Zotlabs/Module/Block.php:43 ../../Zotlabs/Module/Cal.php:65
+#: ../../Zotlabs/Module/Block.php:43 ../../Zotlabs/Module/Cal.php:62
 #: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Wall_upload.php:33
 msgid "Channel not found."
 msgstr "Canal no encontrado."
@@ -1507,7 +1514,7 @@ msgstr "Canal no encontrado."
 msgid "Block Name"
 msgstr "Nombre del bloque"
 
-#: ../../Zotlabs/Module/Blocks.php:151 ../../include/text.php:2277
+#: ../../Zotlabs/Module/Blocks.php:151 ../../include/text.php:2250
 msgid "Blocks"
 msgstr "Bloques"
 
@@ -1529,12 +1536,12 @@ msgstr "Editado"
 
 #: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Layouts.php:191
 #: ../../Zotlabs/Module/Photos.php:1072 ../../Zotlabs/Module/Webpages.php:188
-#: ../../include/conversation.php:1214
+#: ../../include/conversation.php:1208
 msgid "Share"
 msgstr "Compartir"
 
 #: ../../Zotlabs/Module/Blocks.php:163 ../../Zotlabs/Module/Layouts.php:195
-#: ../../Zotlabs/Module/Pubsites.php:46 ../../Zotlabs/Module/Webpages.php:193
+#: ../../Zotlabs/Module/Pubsites.php:47 ../../Zotlabs/Module/Webpages.php:193
 #: ../../include/page_widgets.php:39
 msgid "View"
 msgstr "Ver"
@@ -1551,54 +1558,54 @@ msgstr "Mis marcadores"
 msgid "My Connections Bookmarks"
 msgstr "Marcadores de mis conexiones"
 
-#: ../../Zotlabs/Module/Cal.php:72
+#: ../../Zotlabs/Module/Cal.php:69
 msgid "Permissions denied."
 msgstr "Permisos denegados."
 
-#: ../../Zotlabs/Module/Cal.php:262 ../../Zotlabs/Module/Events.php:588
+#: ../../Zotlabs/Module/Cal.php:259 ../../Zotlabs/Module/Events.php:588
 msgid "l, F j"
 msgstr "l j F"
 
-#: ../../Zotlabs/Module/Cal.php:311 ../../Zotlabs/Module/Events.php:637
-#: ../../include/text.php:1743
+#: ../../Zotlabs/Module/Cal.php:308 ../../Zotlabs/Module/Events.php:637
+#: ../../include/text.php:1717
 msgid "Link to Source"
 msgstr "Enlazar con la entrada en su ubicación original"
 
-#: ../../Zotlabs/Module/Cal.php:334 ../../Zotlabs/Module/Events.php:665
+#: ../../Zotlabs/Module/Cal.php:331 ../../Zotlabs/Module/Events.php:665
 msgid "Edit Event"
 msgstr "Editar el evento"
 
-#: ../../Zotlabs/Module/Cal.php:334 ../../Zotlabs/Module/Events.php:665
+#: ../../Zotlabs/Module/Cal.php:331 ../../Zotlabs/Module/Events.php:665
 msgid "Create Event"
 msgstr "Crear un evento"
 
-#: ../../Zotlabs/Module/Cal.php:335 ../../Zotlabs/Module/Cal.php:342
+#: ../../Zotlabs/Module/Cal.php:332 ../../Zotlabs/Module/Cal.php:339
 #: ../../Zotlabs/Module/Events.php:666 ../../Zotlabs/Module/Events.php:673
 #: ../../Zotlabs/Module/Photos.php:949
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../../Zotlabs/Module/Cal.php:336 ../../Zotlabs/Module/Cal.php:343
+#: ../../Zotlabs/Module/Cal.php:333 ../../Zotlabs/Module/Cal.php:340
 #: ../../Zotlabs/Module/Events.php:667 ../../Zotlabs/Module/Events.php:674
-#: ../../Zotlabs/Module/Photos.php:958 ../../Zotlabs/Module/Setup.php:290
+#: ../../Zotlabs/Module/Photos.php:958 ../../Zotlabs/Module/Setup.php:267
 msgid "Next"
 msgstr "Siguiente"
 
-#: ../../Zotlabs/Module/Cal.php:337 ../../Zotlabs/Module/Events.php:668
+#: ../../Zotlabs/Module/Cal.php:334 ../../Zotlabs/Module/Events.php:668
 #: ../../include/widgets.php:755
 msgid "Export"
 msgstr "Exportar"
 
-#: ../../Zotlabs/Module/Cal.php:340 ../../Zotlabs/Module/Events.php:671
+#: ../../Zotlabs/Module/Cal.php:337 ../../Zotlabs/Module/Events.php:671
 #: ../../include/widgets.php:756
 msgid "Import"
 msgstr "Importar"
 
-#: ../../Zotlabs/Module/Cal.php:344 ../../Zotlabs/Module/Events.php:675
+#: ../../Zotlabs/Module/Cal.php:341 ../../Zotlabs/Module/Events.php:675
 msgid "Today"
 msgstr "Hoy"
 
-#: ../../Zotlabs/Module/Channel.php:29 ../../Zotlabs/Module/Chat.php:23
+#: ../../Zotlabs/Module/Channel.php:29 ../../Zotlabs/Module/Chat.php:25
 msgid "You must be logged in to see this page."
 msgstr "Debe haber iniciado sesión para poder ver esta página."
 
@@ -1614,97 +1621,97 @@ msgstr "Solo publicaciones"
 msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr "Permisos insuficientes. Petición redirigida a la página del perfil."
 
-#: ../../Zotlabs/Module/Chat.php:179
+#: ../../Zotlabs/Module/Chat.php:181
 msgid "Room not found"
 msgstr "Sala no encontrada"
 
-#: ../../Zotlabs/Module/Chat.php:195
+#: ../../Zotlabs/Module/Chat.php:197
 msgid "Leave Room"
 msgstr "Abandonar la sala"
 
-#: ../../Zotlabs/Module/Chat.php:196
+#: ../../Zotlabs/Module/Chat.php:198
 msgid "Delete Room"
 msgstr "Eliminar esta sala"
 
-#: ../../Zotlabs/Module/Chat.php:197
+#: ../../Zotlabs/Module/Chat.php:199
 msgid "I am away right now"
 msgstr "Estoy ausente momentáneamente"
 
-#: ../../Zotlabs/Module/Chat.php:198
+#: ../../Zotlabs/Module/Chat.php:200
 msgid "I am online"
 msgstr "Estoy conectado/a"
 
-#: ../../Zotlabs/Module/Chat.php:200
+#: ../../Zotlabs/Module/Chat.php:202
 msgid "Bookmark this room"
 msgstr "Añadir esta sala a Marcadores"
 
-#: ../../Zotlabs/Module/Chat.php:203 ../../Zotlabs/Module/Mail.php:206
-#: ../../Zotlabs/Module/Mail.php:320 ../../include/conversation.php:1182
+#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:205
+#: ../../Zotlabs/Module/Mail.php:314 ../../include/conversation.php:1176
 msgid "Please enter a link URL:"
 msgstr "Por favor, introduzca la dirección del enlace:"
 
-#: ../../Zotlabs/Module/Chat.php:204 ../../Zotlabs/Module/Mail.php:259
-#: ../../Zotlabs/Module/Mail.php:389 ../../include/ItemObject.php:715
-#: ../../include/conversation.php:1262
+#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:258
+#: ../../Zotlabs/Module/Mail.php:383 ../../Zotlabs/Lib/ThreadItem.php:711
+#: ../../include/conversation.php:1256
 msgid "Encrypt text"
 msgstr "Cifrar texto"
 
-#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Editblock.php:111
-#: ../../Zotlabs/Module/Editwebpage.php:147 ../../Zotlabs/Module/Mail.php:253
-#: ../../Zotlabs/Module/Mail.php:383 ../../include/conversation.php:1149
+#: ../../Zotlabs/Module/Chat.php:207 ../../Zotlabs/Module/Editblock.php:111
+#: ../../Zotlabs/Module/Editwebpage.php:147 ../../Zotlabs/Module/Mail.php:252
+#: ../../Zotlabs/Module/Mail.php:377 ../../include/conversation.php:1143
 msgid "Insert web link"
 msgstr "Insertar enlace web"
 
-#: ../../Zotlabs/Module/Chat.php:216
+#: ../../Zotlabs/Module/Chat.php:218
 msgid "Feature disabled."
 msgstr "Funcionalidad deshabilitada."
 
-#: ../../Zotlabs/Module/Chat.php:230
+#: ../../Zotlabs/Module/Chat.php:232
 msgid "New Chatroom"
 msgstr "Nueva sala de chat"
 
-#: ../../Zotlabs/Module/Chat.php:231
+#: ../../Zotlabs/Module/Chat.php:233
 msgid "Chatroom name"
 msgstr "Nombre de la sala de chat"
 
-#: ../../Zotlabs/Module/Chat.php:232
+#: ../../Zotlabs/Module/Chat.php:234
 msgid "Expiration of chats (minutes)"
 msgstr "Caducidad de los mensajes en los chats (en minutos)"
 
-#: ../../Zotlabs/Module/Chat.php:233 ../../Zotlabs/Module/Filestorage.php:153
+#: ../../Zotlabs/Module/Chat.php:235 ../../Zotlabs/Module/Filestorage.php:153
 #: ../../Zotlabs/Module/Photos.php:671 ../../Zotlabs/Module/Photos.php:1045
 #: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:359
-#: ../../include/acl_selectors.php:288
+#: ../../include/acl_selectors.php:283
 msgid "Permissions"
 msgstr "Permisos"
 
-#: ../../Zotlabs/Module/Chat.php:244
+#: ../../Zotlabs/Module/Chat.php:246
 #, php-format
 msgid "%1$s's Chatrooms"
 msgstr "Salas de chat de %1$s"
 
-#: ../../Zotlabs/Module/Chat.php:249
+#: ../../Zotlabs/Module/Chat.php:251
 msgid "No chatrooms available"
 msgstr "No hay salas de chat disponibles"
 
-#: ../../Zotlabs/Module/Chat.php:250 ../../Zotlabs/Module/Manage.php:143
-#: ../../Zotlabs/Module/Profiles.php:782
+#: ../../Zotlabs/Module/Chat.php:252 ../../Zotlabs/Module/Manage.php:143
+#: ../../Zotlabs/Module/Profiles.php:778
 msgid "Create New"
 msgstr "Crear"
 
-#: ../../Zotlabs/Module/Chat.php:253
+#: ../../Zotlabs/Module/Chat.php:255
 msgid "Expiration"
 msgstr "Caducidad"
 
-#: ../../Zotlabs/Module/Chat.php:254
+#: ../../Zotlabs/Module/Chat.php:256
 msgid "min"
 msgstr "min"
 
-#: ../../Zotlabs/Module/Chatsvc.php:115
+#: ../../Zotlabs/Module/Chatsvc.php:117
 msgid "Away"
 msgstr "Ausente"
 
-#: ../../Zotlabs/Module/Chatsvc.php:120
+#: ../../Zotlabs/Module/Chatsvc.php:122
 msgid "Online"
 msgstr "Conectado/a"
 
@@ -1789,13 +1796,13 @@ msgstr "Archivadas"
 
 #: ../../Zotlabs/Module/Connections.php:76
 #: ../../Zotlabs/Module/Connections.php:86 ../../Zotlabs/Module/Menu.php:116
-#: ../../include/conversation.php:1541
+#: ../../include/conversation.php:1535
 msgid "New"
 msgstr "Nuevas"
 
 #: ../../Zotlabs/Module/Connections.php:92
 #: ../../Zotlabs/Module/Connections.php:107
-#: ../../Zotlabs/Module/Connedit.php:597 ../../include/widgets.php:497
+#: ../../Zotlabs/Module/Connedit.php:594 ../../include/widgets.php:497
 msgid "All"
 msgstr "Todos/as"
 
@@ -1870,7 +1877,7 @@ msgid "Ignore connection"
 msgstr "Ignorar esta conexión"
 
 #: ../../Zotlabs/Module/Connections.php:277
-#: ../../Zotlabs/Module/Connedit.php:549
+#: ../../Zotlabs/Module/Connedit.php:548
 #: ../../Zotlabs/Module/Notifications.php:55
 msgid "Ignore"
 msgstr "Ignorar"
@@ -1879,15 +1886,15 @@ msgstr "Ignorar"
 msgid "Recent activity"
 msgstr "Actividad reciente"
 
-#: ../../Zotlabs/Module/Connections.php:302 ../../include/nav.php:186
-#: ../../include/text.php:863 ../../include/apps.php:159
+#: ../../Zotlabs/Module/Connections.php:302 ../../Zotlabs/Lib/Apps.php:208
+#: ../../include/nav.php:186 ../../include/text.php:875
 msgid "Connections"
 msgstr "Conexiones"
 
 #: ../../Zotlabs/Module/Connections.php:306 ../../Zotlabs/Module/Search.php:44
-#: ../../include/nav.php:165 ../../include/text.php:933
-#: ../../include/text.php:945 ../../include/apps.php:179
-#: ../../include/acl_selectors.php:281
+#: ../../Zotlabs/Lib/Apps.php:228 ../../include/nav.php:165
+#: ../../include/acl_selectors.php:276 ../../include/text.php:945
+#: ../../include/text.php:957
 msgid "Search"
 msgstr "Buscar"
 
@@ -1901,7 +1908,7 @@ msgstr "Buscar conexiones"
 
 #: ../../Zotlabs/Module/Connections.php:309
 #: ../../Zotlabs/Module/Directory.php:388
-#: ../../Zotlabs/Module/Directory.php:393 ../../include/contact_widgets.php:26
+#: ../../Zotlabs/Module/Directory.php:393 ../../include/contact_widgets.php:23
 msgid "Find"
 msgstr "Encontrar"
 
@@ -1939,240 +1946,240 @@ msgstr "Recarga fallida - no se puede encontrar el canal en este momento."
 msgid "Unable to set address book parameters."
 msgstr "No ha sido posible establecer los parámetros de la libreta de direcciones."
 
-#: ../../Zotlabs/Module/Connedit.php:504
+#: ../../Zotlabs/Module/Connedit.php:503
 msgid "Connection has been removed."
 msgstr "La conexión ha sido eliminada."
 
-#: ../../Zotlabs/Module/Connedit.php:520 ../../include/nav.php:86
-#: ../../include/conversation.php:959 ../../include/apps.php:170
+#: ../../Zotlabs/Module/Connedit.php:519 ../../Zotlabs/Lib/Apps.php:219
+#: ../../include/conversation.php:954 ../../include/nav.php:86
 msgid "View Profile"
 msgstr "Ver el perfil"
 
-#: ../../Zotlabs/Module/Connedit.php:523
+#: ../../Zotlabs/Module/Connedit.php:522
 #, php-format
 msgid "View %s's profile"
 msgstr "Ver el perfil de %s"
 
-#: ../../Zotlabs/Module/Connedit.php:527
+#: ../../Zotlabs/Module/Connedit.php:526
 msgid "Refresh Permissions"
 msgstr "Recargar los permisos"
 
-#: ../../Zotlabs/Module/Connedit.php:530
+#: ../../Zotlabs/Module/Connedit.php:529
 msgid "Fetch updated permissions"
 msgstr "Obtener los permisos actualizados"
 
-#: ../../Zotlabs/Module/Connedit.php:534
+#: ../../Zotlabs/Module/Connedit.php:533
 msgid "Recent Activity"
 msgstr "Actividad reciente"
 
-#: ../../Zotlabs/Module/Connedit.php:537
+#: ../../Zotlabs/Module/Connedit.php:536
 msgid "View recent posts and comments"
 msgstr "Ver publicaciones y comentarios recientes"
 
-#: ../../Zotlabs/Module/Connedit.php:544
+#: ../../Zotlabs/Module/Connedit.php:543
 msgid "Block (or Unblock) all communications with this connection"
 msgstr "Bloquear (o desbloquear) todas las comunicaciones con esta conexión"
 
-#: ../../Zotlabs/Module/Connedit.php:545
+#: ../../Zotlabs/Module/Connedit.php:544
 msgid "This connection is blocked!"
 msgstr "¡Esta conexión está bloqueada!"
 
-#: ../../Zotlabs/Module/Connedit.php:549
+#: ../../Zotlabs/Module/Connedit.php:548
 msgid "Unignore"
 msgstr "Dejar de ignorar"
 
-#: ../../Zotlabs/Module/Connedit.php:552
+#: ../../Zotlabs/Module/Connedit.php:551
 msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr "Ignorar (o dejar de ignorar) todas las comunicaciones entrantes de esta conexión"
 
-#: ../../Zotlabs/Module/Connedit.php:553
+#: ../../Zotlabs/Module/Connedit.php:552
 msgid "This connection is ignored!"
 msgstr "¡Esta conexión es ignorada!"
 
-#: ../../Zotlabs/Module/Connedit.php:557
+#: ../../Zotlabs/Module/Connedit.php:556
 msgid "Unarchive"
 msgstr "Desarchivar"
 
-#: ../../Zotlabs/Module/Connedit.php:557
+#: ../../Zotlabs/Module/Connedit.php:556
 msgid "Archive"
 msgstr "Archivar"
 
-#: ../../Zotlabs/Module/Connedit.php:560
+#: ../../Zotlabs/Module/Connedit.php:559
 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"
 
-#: ../../Zotlabs/Module/Connedit.php:561
+#: ../../Zotlabs/Module/Connedit.php:560
 msgid "This connection is archived!"
 msgstr "¡Esta conexión esta archivada!"
 
-#: ../../Zotlabs/Module/Connedit.php:565
+#: ../../Zotlabs/Module/Connedit.php:564
 msgid "Unhide"
 msgstr "Mostrar"
 
-#: ../../Zotlabs/Module/Connedit.php:565
+#: ../../Zotlabs/Module/Connedit.php:564
 msgid "Hide"
 msgstr "Ocultar"
 
-#: ../../Zotlabs/Module/Connedit.php:568
+#: ../../Zotlabs/Module/Connedit.php:567
 msgid "Hide or Unhide this connection from your other connections"
 msgstr "Ocultar o mostrar esta conexión a sus otras conexiones"
 
-#: ../../Zotlabs/Module/Connedit.php:569
+#: ../../Zotlabs/Module/Connedit.php:568
 msgid "This connection is hidden!"
 msgstr "¡Esta conexión está oculta!"
 
-#: ../../Zotlabs/Module/Connedit.php:576
+#: ../../Zotlabs/Module/Connedit.php:575
 msgid "Delete this connection"
 msgstr "Eliminar esta conexión"
 
-#: ../../Zotlabs/Module/Connedit.php:593 ../../include/widgets.php:493
+#: ../../Zotlabs/Module/Connedit.php:590 ../../include/widgets.php:493
 msgid "Me"
 msgstr "Yo"
 
-#: ../../Zotlabs/Module/Connedit.php:594 ../../include/widgets.php:494
+#: ../../Zotlabs/Module/Connedit.php:591 ../../include/widgets.php:494
 msgid "Family"
 msgstr "Familia"
 
-#: ../../Zotlabs/Module/Connedit.php:595 ../../Zotlabs/Module/Settings.php:342
+#: ../../Zotlabs/Module/Connedit.php:592 ../../Zotlabs/Module/Settings.php:342
 #: ../../Zotlabs/Module/Settings.php:346 ../../Zotlabs/Module/Settings.php:347
 #: ../../Zotlabs/Module/Settings.php:350 ../../Zotlabs/Module/Settings.php:361
-#: ../../include/profile_selectors.php:80 ../../include/widgets.php:495
-#: ../../include/identity.php:389 ../../include/identity.php:390
-#: ../../include/identity.php:397
+#: ../../include/selectors.php:123 ../../include/channel.php:389
+#: ../../include/channel.php:390 ../../include/channel.php:397
+#: ../../include/widgets.php:495
 msgid "Friends"
 msgstr "Amigos/as"
 
-#: ../../Zotlabs/Module/Connedit.php:596 ../../include/widgets.php:496
+#: ../../Zotlabs/Module/Connedit.php:593 ../../include/widgets.php:496
 msgid "Acquaintances"
 msgstr "Conocidos/as"
 
-#: ../../Zotlabs/Module/Connedit.php:657
+#: ../../Zotlabs/Module/Connedit.php:654
 msgid "Approve this connection"
 msgstr "Aprobar esta conexión"
 
-#: ../../Zotlabs/Module/Connedit.php:657
+#: ../../Zotlabs/Module/Connedit.php:654
 msgid "Accept connection to allow communication"
 msgstr "Aceptar la conexión para permitir la comunicación"
 
-#: ../../Zotlabs/Module/Connedit.php:662
+#: ../../Zotlabs/Module/Connedit.php:659
 msgid "Set Affinity"
 msgstr "Ajustar la afinidad"
 
-#: ../../Zotlabs/Module/Connedit.php:665
+#: ../../Zotlabs/Module/Connedit.php:662
 msgid "Set Profile"
 msgstr "Ajustar el perfil"
 
-#: ../../Zotlabs/Module/Connedit.php:668
+#: ../../Zotlabs/Module/Connedit.php:665
 msgid "Set Affinity & Profile"
 msgstr "Ajustar la afinidad y el perfil"
 
-#: ../../Zotlabs/Module/Connedit.php:701
+#: ../../Zotlabs/Module/Connedit.php:698
 msgid "none"
 msgstr "-"
 
-#: ../../Zotlabs/Module/Connedit.php:705 ../../include/widgets.php:614
+#: ../../Zotlabs/Module/Connedit.php:702 ../../include/widgets.php:614
 msgid "Connection Default Permissions"
 msgstr "Permisos predeterminados de conexión"
 
-#: ../../Zotlabs/Module/Connedit.php:705 ../../include/items.php:3927
+#: ../../Zotlabs/Module/Connedit.php:702 ../../include/items.php:3928
 #, php-format
 msgid "Connection: %s"
 msgstr "Conexión: %s"
 
-#: ../../Zotlabs/Module/Connedit.php:706
+#: ../../Zotlabs/Module/Connedit.php:703
 msgid "Apply these permissions automatically"
 msgstr "Aplicar estos permisos automaticamente"
 
-#: ../../Zotlabs/Module/Connedit.php:706
+#: ../../Zotlabs/Module/Connedit.php:703
 msgid "Connection requests will be approved without your interaction"
 msgstr "Las solicitudes de conexión serán aprobadas sin su intervención"
 
-#: ../../Zotlabs/Module/Connedit.php:708
+#: ../../Zotlabs/Module/Connedit.php:705
 msgid "This connection's primary address is"
 msgstr "La dirección primaria de esta conexión es"
 
-#: ../../Zotlabs/Module/Connedit.php:709
+#: ../../Zotlabs/Module/Connedit.php:706
 msgid "Available locations:"
 msgstr "Ubicaciones disponibles:"
 
-#: ../../Zotlabs/Module/Connedit.php:713
+#: ../../Zotlabs/Module/Connedit.php:710
 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."
 
-#: ../../Zotlabs/Module/Connedit.php:714
+#: ../../Zotlabs/Module/Connedit.php:711
 msgid "Connection Tools"
 msgstr "Gestión de las conexiones"
 
-#: ../../Zotlabs/Module/Connedit.php:716
+#: ../../Zotlabs/Module/Connedit.php:713
 msgid "Slide to adjust your degree of friendship"
 msgstr "Deslizar para ajustar el grado de amistad"
 
-#: ../../Zotlabs/Module/Connedit.php:717 ../../Zotlabs/Module/Rate.php:159
+#: ../../Zotlabs/Module/Connedit.php:714 ../../Zotlabs/Module/Rate.php:159
 #: ../../include/js_strings.php:20
 msgid "Rating"
 msgstr "Valoración"
 
-#: ../../Zotlabs/Module/Connedit.php:718
+#: ../../Zotlabs/Module/Connedit.php:715
 msgid "Slide to adjust your rating"
 msgstr "Deslizar para ajustar su valoración"
 
-#: ../../Zotlabs/Module/Connedit.php:719 ../../Zotlabs/Module/Connedit.php:724
+#: ../../Zotlabs/Module/Connedit.php:716 ../../Zotlabs/Module/Connedit.php:721
 msgid "Optionally explain your rating"
 msgstr "Opcionalmente, puede explicar su valoración"
 
-#: ../../Zotlabs/Module/Connedit.php:721
+#: ../../Zotlabs/Module/Connedit.php:718
 msgid "Custom Filter"
 msgstr "Filtro personalizado"
 
-#: ../../Zotlabs/Module/Connedit.php:722
+#: ../../Zotlabs/Module/Connedit.php:719
 msgid "Only import posts with this text"
 msgstr "Importar solo entradas que contengan este texto"
 
-#: ../../Zotlabs/Module/Connedit.php:722 ../../Zotlabs/Module/Connedit.php:723
+#: ../../Zotlabs/Module/Connedit.php:719 ../../Zotlabs/Module/Connedit.php:720
 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"
 
-#: ../../Zotlabs/Module/Connedit.php:723
+#: ../../Zotlabs/Module/Connedit.php:720
 msgid "Do not import posts with this text"
 msgstr "No importar entradas que contengan este texto"
 
-#: ../../Zotlabs/Module/Connedit.php:725
+#: ../../Zotlabs/Module/Connedit.php:722
 msgid "This information is public!"
 msgstr "¡Esta información es pública!"
 
-#: ../../Zotlabs/Module/Connedit.php:730
+#: ../../Zotlabs/Module/Connedit.php:727
 msgid "Connection Pending Approval"
 msgstr "Conexión pendiente de aprobación"
 
-#: ../../Zotlabs/Module/Connedit.php:733
+#: ../../Zotlabs/Module/Connedit.php:730
 msgid "inherited"
 msgstr "heredado"
 
-#: ../../Zotlabs/Module/Connedit.php:735
+#: ../../Zotlabs/Module/Connedit.php:732
 #, 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."
 
-#: ../../Zotlabs/Module/Connedit.php:737
+#: ../../Zotlabs/Module/Connedit.php:734
 msgid "Their Settings"
 msgstr "Sus ajustes"
 
-#: ../../Zotlabs/Module/Connedit.php:738
+#: ../../Zotlabs/Module/Connedit.php:735
 msgid "My Settings"
 msgstr "Mis ajustes"
 
-#: ../../Zotlabs/Module/Connedit.php:740
+#: ../../Zotlabs/Module/Connedit.php:737
 msgid "Individual Permissions"
 msgstr "Permisos individuales"
 
-#: ../../Zotlabs/Module/Connedit.php:741
+#: ../../Zotlabs/Module/Connedit.php:738
 msgid ""
 "Some permissions may be inherited from your channel's <a "
 "href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
@@ -2180,7 +2187,7 @@ msgid ""
 " 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í."
 
-#: ../../Zotlabs/Module/Connedit.php:742
+#: ../../Zotlabs/Module/Connedit.php:739
 msgid ""
 "Some permissions may be inherited from your channel's <a "
 "href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
@@ -2188,7 +2195,7 @@ msgid ""
 "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."
 
-#: ../../Zotlabs/Module/Connedit.php:743
+#: ../../Zotlabs/Module/Connedit.php:740
 msgid "Last update:"
 msgstr "Última actualización:"
 
@@ -2208,7 +2215,7 @@ msgid "Image resize failed."
 msgstr "El ajuste del tamaño de la imagen ha fallado."
 
 #: ../../Zotlabs/Module/Cover_photo.php:168
-#: ../../Zotlabs/Module/Profile_photo.php:192 ../../include/photos.php:146
+#: ../../Zotlabs/Module/Profile_photo.php:192 ../../include/photos.php:144
 msgid "Unable to process image"
 msgstr "No ha sido posible procesar la imagen"
 
@@ -2222,30 +2229,30 @@ msgstr "La carga de la imagen ha fallado."
 msgid "Unable to process image."
 msgstr "No ha sido posible procesar la imagen."
 
-#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4271
+#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4272
 msgid "female"
 msgstr "mujer"
 
-#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4272
+#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4273
 #, php-format
 msgid "%1$s updated her %2$s"
 msgstr "%1$s ha actualizado su %2$s"
 
-#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:4273
+#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:4274
 msgid "male"
 msgstr "hombre"
 
-#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4274
+#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4275
 #, php-format
 msgid "%1$s updated his %2$s"
 msgstr "%1$s ha actualizado su %2$s"
 
-#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4276
+#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4277
 #, php-format
 msgid "%1$s updated their %2$s"
 msgstr "%1$s ha actualizado su %2$s"
 
-#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/identity.php:1807
+#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/channel.php:1661
 msgid "cover photo"
 msgstr "Imagen de portada del perfil"
 
@@ -2301,10 +2308,10 @@ msgstr "Por favor ajuste el recorte de la imagen para una visión óptima."
 msgid "Done Editing"
 msgstr "Edición completada"
 
-#: ../../Zotlabs/Module/Directory.php:63 ../../Zotlabs/Module/Display.php:21
+#: ../../Zotlabs/Module/Directory.php:63 ../../Zotlabs/Module/Display.php:17
 #: ../../Zotlabs/Module/Photos.php:522 ../../Zotlabs/Module/Ratings.php:86
 #: ../../Zotlabs/Module/Search.php:17
-#: ../../Zotlabs/Module/Viewconnections.php:21
+#: ../../Zotlabs/Module/Viewconnections.php:20
 msgid "Public access denied."
 msgstr "Acceso público denegado."
 
@@ -2327,13 +2334,13 @@ msgstr "Estado:"
 msgid "Homepage: "
 msgstr "Página personal:"
 
-#: ../../Zotlabs/Module/Directory.php:306 ../../include/identity.php:1329
+#: ../../Zotlabs/Module/Directory.php:306 ../../include/channel.php:1183
 msgid "Age:"
 msgstr "Edad:"
 
 #: ../../Zotlabs/Module/Directory.php:311 ../../include/event.php:52
-#: ../../include/identity.php:1029 ../../include/text.php:1481
-#: ../../include/bb2diaspora.php:509
+#: ../../include/event.php:84 ../../include/channel.php:1027
+#: ../../include/bb2diaspora.php:507
 msgid "Location:"
 msgstr "Ubicación:"
 
@@ -2341,18 +2348,18 @@ msgstr "Ubicación:"
 msgid "Description:"
 msgstr "Descripción:"
 
-#: ../../Zotlabs/Module/Directory.php:322 ../../include/identity.php:1345
+#: ../../Zotlabs/Module/Directory.php:322 ../../include/channel.php:1199
 msgid "Hometown:"
 msgstr "Lugar de nacimiento:"
 
-#: ../../Zotlabs/Module/Directory.php:324 ../../include/identity.php:1353
+#: ../../Zotlabs/Module/Directory.php:324 ../../include/channel.php:1207
 msgid "About:"
 msgstr "Sobre mí:"
 
 #: ../../Zotlabs/Module/Directory.php:325 ../../Zotlabs/Module/Match.php:68
-#: ../../Zotlabs/Module/Suggest.php:56 ../../include/Contact.php:101
+#: ../../Zotlabs/Module/Suggest.php:56 ../../include/connections.php:78
+#: ../../include/conversation.php:956 ../../include/channel.php:1012
 #: ../../include/widgets.php:147 ../../include/widgets.php:184
-#: ../../include/identity.php:1014 ../../include/conversation.php:961
 msgid "Connect"
 msgstr "Conectar"
 
@@ -2385,7 +2392,7 @@ msgid "Finding:"
 msgstr "Encontrar:"
 
 #: ../../Zotlabs/Module/Directory.php:392 ../../Zotlabs/Module/Suggest.php:64
-#: ../../include/contact_widgets.php:27
+#: ../../include/contact_widgets.php:24
 msgid "Channel Suggestions"
 msgstr "Sugerencias de canales"
 
@@ -2429,14 +2436,6 @@ msgstr "Este sitio no es un servidor de directorio"
 msgid "This directory server requires an access token"
 msgstr "El servidor de este directorio necesita un \"token\" de acceso"
 
-#: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:49
-#: ../../Zotlabs/Module/Group.php:72 ../../Zotlabs/Module/Import_items.php:112
-#: ../../Zotlabs/Module/Like.php:284 ../../Zotlabs/Module/Profperm.php:28
-#: ../../Zotlabs/Module/Subthread.php:62 ../../include/items.php:383
-#: ../../index.php:174
-msgid "Permission denied"
-msgstr "Permiso denegado"
-
 #: ../../Zotlabs/Module/Dreport.php:27
 msgid "Invalid message"
 msgstr "Mensaje no válido"
@@ -2500,7 +2499,7 @@ msgstr "correo enviado"
 msgid "Item not found"
 msgstr "Elemento no encontrado"
 
-#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1234
+#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1228
 msgid "Title (optional)"
 msgstr "Título (opcional)"
 
@@ -2564,8 +2563,8 @@ msgid "Event not found."
 msgstr "Evento no encontrado."
 
 #: ../../Zotlabs/Module/Events.php:254 ../../Zotlabs/Module/Like.php:373
-#: ../../Zotlabs/Module/Tagger.php:51 ../../include/event.php:905
-#: ../../include/conversation.php:123 ../../include/text.php:1955
+#: ../../Zotlabs/Module/Tagger.php:51 ../../include/conversation.php:123
+#: ../../include/event.php:949 ../../include/text.php:1928
 msgid "event"
 msgstr "evento"
 
@@ -2628,8 +2627,8 @@ msgid "Edit Location"
 msgstr "Modificar la dirección"
 
 #: ../../Zotlabs/Module/Events.php:464 ../../Zotlabs/Module/Locs.php:117
-#: ../../Zotlabs/Module/Profiles.php:476 ../../Zotlabs/Module/Profiles.php:702
-#: ../../Zotlabs/Module/Pubsites.php:40 ../../include/js_strings.php:25
+#: ../../Zotlabs/Module/Profiles.php:477 ../../Zotlabs/Module/Profiles.php:698
+#: ../../Zotlabs/Module/Pubsites.php:41 ../../include/js_strings.php:25
 msgid "Location"
 msgstr "Ubicación"
 
@@ -2638,12 +2637,12 @@ msgid "Share this event"
 msgstr "Compartir este evento"
 
 #: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Photos.php:1093
-#: ../../Zotlabs/Module/Webpages.php:194 ../../include/ItemObject.php:712
-#: ../../include/conversation.php:1193 ../../include/page_widgets.php:40
+#: ../../Zotlabs/Module/Webpages.php:194 ../../Zotlabs/Lib/ThreadItem.php:708
+#: ../../include/conversation.php:1187 ../../include/page_widgets.php:40
 msgid "Preview"
 msgstr "Previsualizar"
 
-#: ../../Zotlabs/Module/Events.php:471 ../../include/conversation.php:1238
+#: ../../Zotlabs/Module/Events.php:471 ../../include/conversation.php:1232
 msgid "Permission settings"
 msgstr "Configuración de permisos"
 
@@ -2671,8 +2670,8 @@ msgstr "Evento borrado"
 msgid "Failed to remove event"
 msgstr "Error al eliminar el evento"
 
-#: ../../Zotlabs/Module/Fbrowser.php:29 ../../include/nav.php:92
-#: ../../include/conversation.php:1638 ../../include/apps.php:171
+#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:220
+#: ../../include/conversation.php:1632 ../../include/nav.php:92
 msgid "Photos"
 msgstr "Fotos"
 
@@ -2740,23 +2739,6 @@ msgstr "Avisar a sus contactos sobre este fichero"
 msgid "Channel added."
 msgstr "Canal añadido."
 
-#: ../../Zotlabs/Module/Fsuggest.php:24 ../../Zotlabs/Module/Fsuggest.php:96
-msgid "Contact not found."
-msgstr "Contacto no encontrado"
-
-#: ../../Zotlabs/Module/Fsuggest.php:67
-msgid "Friend suggestion sent."
-msgstr "Enviar sugerencia a un amigo."
-
-#: ../../Zotlabs/Module/Fsuggest.php:101
-msgid "Suggest Friends"
-msgstr "Sugerir amigos"
-
-#: ../../Zotlabs/Module/Fsuggest.php:103
-#, php-format
-msgid "Suggest a friend for %s"
-msgstr "Sugerir un amigo a %s"
-
 #: ../../Zotlabs/Module/Group.php:24
 msgid "Privacy group created."
 msgstr "El grupo de canales ha sido creado."
@@ -2766,7 +2748,7 @@ msgid "Could not create privacy group."
 msgstr "No se puede crear el grupo de canales"
 
 #: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141
-#: ../../include/items.php:3894
+#: ../../include/items.php:3895
 msgid "Privacy group not found."
 msgstr "Grupo de canales no encontrado."
 
@@ -2820,8 +2802,8 @@ msgid "Help:"
 msgstr "Ayuda:"
 
 #: ../../Zotlabs/Module/Help.php:85 ../../Zotlabs/Module/Help.php:90
-#: ../../Zotlabs/Module/Layouts.php:183 ../../include/nav.php:159
-#: ../../include/apps.php:174
+#: ../../Zotlabs/Module/Layouts.php:183 ../../Zotlabs/Lib/Apps.php:223
+#: ../../include/nav.php:159
 msgid "Help"
 msgstr "Ayuda"
 
@@ -2856,7 +2838,7 @@ msgid "Full Name"
 msgstr "Nombre completo"
 
 #: ../../Zotlabs/Module/Id.php:19 ../../Zotlabs/Module/Id.php:20
-#: ../../Zotlabs/Module/Id.php:21 ../../include/apps.php:187
+#: ../../Zotlabs/Module/Id.php:21 ../../Zotlabs/Lib/Apps.php:236
 msgid "Profile Photo"
 msgstr "Foto del perfil"
 
@@ -2888,11 +2870,11 @@ msgstr "Foto del perfil 128px"
 msgid "Timezone"
 msgstr "Huso horario"
 
-#: ../../Zotlabs/Module/Id.php:29 ../../Zotlabs/Module/Profiles.php:735
+#: ../../Zotlabs/Module/Id.php:29 ../../Zotlabs/Module/Profiles.php:731
 msgid "Homepage URL"
 msgstr "Dirección de la página personal"
 
-#: ../../Zotlabs/Module/Id.php:30 ../../include/apps.php:185
+#: ../../Zotlabs/Module/Id.php:30 ../../Zotlabs/Lib/Apps.php:234
 msgid "Language"
 msgstr "Idioma"
 
@@ -2912,33 +2894,33 @@ msgstr "Día de nacimiento"
 msgid "Birthdate"
 msgstr "Fecha de nacimiento"
 
-#: ../../Zotlabs/Module/Id.php:35 ../../Zotlabs/Module/Profiles.php:453
+#: ../../Zotlabs/Module/Id.php:35 ../../Zotlabs/Module/Profiles.php:454
 msgid "Gender"
 msgstr "Género"
 
-#: ../../Zotlabs/Module/Id.php:108 ../../include/profile_selectors.php:6
-#: ../../include/profile_selectors.php:23
+#: ../../Zotlabs/Module/Id.php:108 ../../include/selectors.php:49
+#: ../../include/selectors.php:66
 msgid "Male"
 msgstr "Hombre"
 
-#: ../../Zotlabs/Module/Id.php:110 ../../include/profile_selectors.php:6
-#: ../../include/profile_selectors.php:23
+#: ../../Zotlabs/Module/Id.php:110 ../../include/selectors.php:49
+#: ../../include/selectors.php:66
 msgid "Female"
 msgstr "Mujer"
 
-#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:193
+#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:192
 msgid "webpage"
 msgstr "página web"
 
-#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:199
+#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:198
 msgid "block"
 msgstr "bloque"
 
-#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:196
+#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:195
 msgid "layout"
 msgstr "plantilla"
 
-#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:202
+#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:201
 msgid "menu"
 msgstr "menú"
 
@@ -2976,7 +2958,7 @@ msgstr "El fichero importado está vacío."
 msgid "Warning: Database versions differ by %1$d updates."
 msgstr "Atención: Las versiones de la base de datos difieren en %1$d actualizaciones."
 
-#: ../../Zotlabs/Module/Import.php:150 ../../include/import.php:84
+#: ../../Zotlabs/Module/Import.php:150 ../../include/import.php:86
 msgid "Cloned channel not found. Import failed."
 msgstr "No se ha podido importar el canal porque el canal clonado no se ha encontrado."
 
@@ -2984,48 +2966,48 @@ msgstr "No se ha podido importar el canal porque el canal clonado no se ha encon
 msgid "No channel. Import failed."
 msgstr "No hay canal. La importación ha fallado"
 
-#: ../../Zotlabs/Module/Import.php:506
-#: ../../include/Import/import_diaspora.php:143
+#: ../../Zotlabs/Module/Import.php:510
+#: ../../include/Import/import_diaspora.php:142
 msgid "Import completed."
 msgstr "Importación completada."
 
-#: ../../Zotlabs/Module/Import.php:528
+#: ../../Zotlabs/Module/Import.php:532
 msgid "You must be logged in to use this feature."
 msgstr "Debe estar registrado para poder usar esta funcionalidad."
 
-#: ../../Zotlabs/Module/Import.php:533
+#: ../../Zotlabs/Module/Import.php:537
 msgid "Import Channel"
 msgstr "Importar canal"
 
-#: ../../Zotlabs/Module/Import.php:534
+#: ../../Zotlabs/Module/Import.php:538
 msgid ""
 "Use this form to import an existing channel from a different server/hub. You"
 " may retrieve the channel identity from the old server/hub via the network "
 "or provide an export file."
 msgstr "Emplee este formulario para importar un canal desde un servidor/hub diferente. Puede recuperar el canal desde el antiguo servidor/hub a través de la red o proporcionando un fichero de exportación."
 
-#: ../../Zotlabs/Module/Import.php:535
+#: ../../Zotlabs/Module/Import.php:539
 #: ../../Zotlabs/Module/Import_items.php:119
 msgid "File to Upload"
 msgstr "Fichero para subir"
 
-#: ../../Zotlabs/Module/Import.php:536
+#: ../../Zotlabs/Module/Import.php:540
 msgid "Or provide the old server/hub details"
 msgstr "O proporcione los detalles de su antiguo servidor/hub"
 
-#: ../../Zotlabs/Module/Import.php:537
+#: ../../Zotlabs/Module/Import.php:541
 msgid "Your old identity address (xyz@example.com)"
 msgstr "Su identidad en el antiguo servidor  (canal@ejemplo.com)"
 
-#: ../../Zotlabs/Module/Import.php:538
+#: ../../Zotlabs/Module/Import.php:542
 msgid "Your old login email address"
 msgstr "Su antigua dirección de correo electrónico"
 
-#: ../../Zotlabs/Module/Import.php:539
+#: ../../Zotlabs/Module/Import.php:543
 msgid "Your old login password"
 msgstr "Su antigua contraseña"
 
-#: ../../Zotlabs/Module/Import.php:540
+#: ../../Zotlabs/Module/Import.php:544
 msgid ""
 "For either option, please choose whether to make this hub your new primary "
 "address, or whether your old location should continue this role. You will be"
@@ -3033,17 +3015,17 @@ msgid ""
 "primary location for files, photos, and media."
 msgstr "Para cualquiera de las opciones, elija si hacer de este servidor su nueva dirección primaria, o si su antigua dirección debe continuar con este papel. Usted podrá publicar desde cualquier ubicación, pero sólo una puede estar marcada como la ubicación principal para los ficheros, fotos y otras imágenes o vídeos."
 
-#: ../../Zotlabs/Module/Import.php:541
+#: ../../Zotlabs/Module/Import.php:545
 msgid "Make this hub my primary location"
 msgstr "Convertir este servidor en mi ubicación primaria"
 
-#: ../../Zotlabs/Module/Import.php:542
+#: ../../Zotlabs/Module/Import.php:546
 msgid ""
 "Import existing posts if possible (experimental - limited by available "
 "memory"
 msgstr "Importar el contenido publicado si es posible (experimental - limitado por la memoria disponible"
 
-#: ../../Zotlabs/Module/Import.php:543
+#: ../../Zotlabs/Module/Import.php:547
 msgid ""
 "This process may take several minutes to complete. Please submit the form "
 "only once and leave this page open until finished."
@@ -3103,7 +3085,7 @@ msgstr "Enviar invitaciones"
 msgid "Enter email addresses, one per line:"
 msgstr "Introduzca las direcciones de correo electrónico, una por línea:"
 
-#: ../../Zotlabs/Module/Invite.php:135 ../../Zotlabs/Module/Mail.php:250
+#: ../../Zotlabs/Module/Invite.php:135 ../../Zotlabs/Module/Mail.php:249
 msgid "Your message:"
 msgstr "Su mensaje:"
 
@@ -3166,7 +3148,7 @@ msgstr "Ha alcanzado su límite de %1$.0f entradas en la página principal."
 msgid "You have reached your limit of %1$.0f webpages."
 msgstr "Ha alcanzado su límite de %1$.0f páginas web."
 
-#: ../../Zotlabs/Module/Layouts.php:181 ../../include/text.php:2279
+#: ../../Zotlabs/Module/Layouts.php:181 ../../include/text.php:2252
 msgid "Layouts"
 msgstr "Plantillas"
 
@@ -3219,12 +3201,12 @@ msgstr "Acción anterior revocada."
 
 #: ../../Zotlabs/Module/Like.php:371 ../../Zotlabs/Module/Subthread.php:87
 #: ../../Zotlabs/Module/Tagger.php:47 ../../include/conversation.php:120
-#: ../../include/text.php:1952
+#: ../../include/text.php:1925
 msgid "photo"
 msgstr "foto"
 
 #: ../../Zotlabs/Module/Like.php:371 ../../Zotlabs/Module/Subthread.php:87
-#: ../../include/conversation.php:148 ../../include/text.php:1958
+#: ../../include/conversation.php:148 ../../include/text.php:1931
 msgid "status"
 msgstr "el mensaje de estado"
 
@@ -3360,7 +3342,7 @@ msgid ""
 "Password reset failed."
 msgstr "La solicitud no ha podido ser verificada. (Puede que la haya enviado con anterioridad) El restablecimiento de la contraseña ha fallado."
 
-#: ../../Zotlabs/Module/Lostpass.php:90 ../../boot.php:1637
+#: ../../Zotlabs/Module/Lostpass.php:90 ../../boot.php:1703
 msgid "Password Reset"
 msgstr "Restablecer la contraseña"
 
@@ -3409,7 +3391,7 @@ msgstr "Dirección de correo electrónico"
 msgid "Reset"
 msgstr "Reiniciar"
 
-#: ../../Zotlabs/Module/Magic.php:73
+#: ../../Zotlabs/Module/Magic.php:71
 msgid "Hub not found."
 msgstr "Servidor no encontrado"
 
@@ -3417,95 +3399,95 @@ msgstr "Servidor no encontrado"
 msgid "Unable to lookup recipient."
 msgstr "Imposible asociar a un destinatario."
 
-#: ../../Zotlabs/Module/Mail.php:46
+#: ../../Zotlabs/Module/Mail.php:45
 msgid "Unable to communicate with requested channel."
 msgstr "Imposible comunicar con el canal solicitado."
 
-#: ../../Zotlabs/Module/Mail.php:53
+#: ../../Zotlabs/Module/Mail.php:52
 msgid "Cannot verify requested channel."
 msgstr "No se puede verificar el canal solicitado."
 
-#: ../../Zotlabs/Module/Mail.php:79
+#: ../../Zotlabs/Module/Mail.php:78
 msgid "Selected channel has private message restrictions. Send failed."
 msgstr "El canal seleccionado tiene restricciones sobre los mensajes privados. El envío falló."
 
-#: ../../Zotlabs/Module/Mail.php:144
+#: ../../Zotlabs/Module/Mail.php:143
 msgid "Messages"
 msgstr "Mensajes"
 
-#: ../../Zotlabs/Module/Mail.php:179
+#: ../../Zotlabs/Module/Mail.php:178
 msgid "Message recalled."
 msgstr "Mensaje revocado."
 
-#: ../../Zotlabs/Module/Mail.php:192
+#: ../../Zotlabs/Module/Mail.php:191
 msgid "Conversation removed."
 msgstr "Conversación eliminada."
 
-#: ../../Zotlabs/Module/Mail.php:207 ../../Zotlabs/Module/Mail.php:321
+#: ../../Zotlabs/Module/Mail.php:206 ../../Zotlabs/Module/Mail.php:315
 msgid "Expires YYYY-MM-DD HH:MM"
 msgstr "Caduca YYYY-MM-DD HH:MM"
 
-#: ../../Zotlabs/Module/Mail.php:235
+#: ../../Zotlabs/Module/Mail.php:234
 msgid "Requested channel is not in this network"
 msgstr "El canal solicitado no existe en esta red"
 
-#: ../../Zotlabs/Module/Mail.php:243
+#: ../../Zotlabs/Module/Mail.php:242
 msgid "Send Private Message"
 msgstr "Enviar un mensaje privado"
 
-#: ../../Zotlabs/Module/Mail.php:244 ../../Zotlabs/Module/Mail.php:374
+#: ../../Zotlabs/Module/Mail.php:243 ../../Zotlabs/Module/Mail.php:368
 msgid "To:"
 msgstr "Para:"
 
-#: ../../Zotlabs/Module/Mail.php:247 ../../Zotlabs/Module/Mail.php:376
+#: ../../Zotlabs/Module/Mail.php:246 ../../Zotlabs/Module/Mail.php:370
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: ../../Zotlabs/Module/Mail.php:252 ../../Zotlabs/Module/Mail.php:382
-#: ../../include/conversation.php:1226
+#: ../../Zotlabs/Module/Mail.php:251 ../../Zotlabs/Module/Mail.php:376
+#: ../../include/conversation.php:1220
 msgid "Attach file"
 msgstr "Adjuntar fichero"
 
-#: ../../Zotlabs/Module/Mail.php:254
+#: ../../Zotlabs/Module/Mail.php:253
 msgid "Send"
 msgstr "Enviar"
 
-#: ../../Zotlabs/Module/Mail.php:257 ../../Zotlabs/Module/Mail.php:387
-#: ../../include/conversation.php:1257
+#: ../../Zotlabs/Module/Mail.php:256 ../../Zotlabs/Module/Mail.php:381
+#: ../../include/conversation.php:1251
 msgid "Set expiration date"
 msgstr "Configurar fecha de caducidad"
 
-#: ../../Zotlabs/Module/Mail.php:346
+#: ../../Zotlabs/Module/Mail.php:340
 msgid "Delete message"
 msgstr "Borrar mensaje"
 
-#: ../../Zotlabs/Module/Mail.php:347
+#: ../../Zotlabs/Module/Mail.php:341
 msgid "Delivery report"
 msgstr "Informe de transmisión"
 
-#: ../../Zotlabs/Module/Mail.php:348
+#: ../../Zotlabs/Module/Mail.php:342
 msgid "Recall message"
 msgstr "Revocar el mensaje"
 
-#: ../../Zotlabs/Module/Mail.php:350
+#: ../../Zotlabs/Module/Mail.php:344
 msgid "Message has been recalled."
 msgstr "El mensaje ha sido revocado."
 
-#: ../../Zotlabs/Module/Mail.php:367
+#: ../../Zotlabs/Module/Mail.php:361
 msgid "Delete Conversation"
 msgstr "Eliminar conversación"
 
-#: ../../Zotlabs/Module/Mail.php:369
+#: ../../Zotlabs/Module/Mail.php:363
 msgid ""
 "No secure communications available. You <strong>may</strong> be able to "
 "respond from the sender's profile page."
 msgstr "Comunicación segura no disponible. Pero <strong>puede</strong> responder desde la página del perfil del remitente."
 
-#: ../../Zotlabs/Module/Mail.php:373
+#: ../../Zotlabs/Module/Mail.php:367
 msgid "Send Reply"
 msgstr "Responder"
 
-#: ../../Zotlabs/Module/Mail.php:378
+#: ../../Zotlabs/Module/Mail.php:372
 #, php-format
 msgid "Your message for %s (%s):"
 msgstr "Su mensaje para %s (%s):"
@@ -3520,8 +3502,8 @@ msgstr "Ha creado %1$.0f de %2$.0f canales permitidos."
 msgid "Create a new channel"
 msgstr "Crear un nuevo canal"
 
-#: ../../Zotlabs/Module/Manage.php:164 ../../include/nav.php:206
-#: ../../include/apps.php:164
+#: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:213
+#: ../../include/nav.php:206
 msgid "Channel Manager"
 msgstr "Administración de canales"
 
@@ -3607,7 +3589,7 @@ msgstr "El menú se puede usar para guardar marcadores"
 msgid "Submit and proceed"
 msgstr "Enviar y proceder"
 
-#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2278
+#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2251
 msgid "Menus"
 msgstr "Menús"
 
@@ -3791,7 +3773,7 @@ msgctxt "mood"
 msgid "%1$s is %2$s"
 msgstr "%1$s está %2$s"
 
-#: ../../Zotlabs/Module/Mood.php:135 ../../include/apps.php:176
+#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:225
 msgid "Mood"
 msgstr "Estado de ánimo"
 
@@ -3972,7 +3954,7 @@ msgstr "La información del propietario de la página no pudo ser recuperada."
 #: ../../Zotlabs/Module/Profile_photo.php:114
 #: ../../Zotlabs/Module/Profile_photo.php:206
 #: ../../Zotlabs/Module/Profile_photo.php:294
-#: ../../include/photo/photo_driver.php:722
+#: ../../include/photo/photo_driver.php:718
 msgid "Profile Photos"
 msgstr "Fotos del perfil"
 
@@ -4042,7 +4024,7 @@ msgid "Album name could not be decoded"
 msgstr "El nombre del álbum no ha podido ser descifrado"
 
 #: ../../Zotlabs/Module/Photos.php:743 ../../Zotlabs/Module/Photos.php:1284
-#: ../../Zotlabs/Module/Photos.php:1301
+#: ../../Zotlabs/Module/Photos.php:1302
 msgid "Contact Photos"
 msgstr "Fotos de contacto"
 
@@ -4054,12 +4036,12 @@ msgstr "Mostrar lo más reciente primero"
 msgid "Show Oldest First"
 msgstr "Mostrar lo más antiguo primero"
 
-#: ../../Zotlabs/Module/Photos.php:792 ../../Zotlabs/Module/Photos.php:1334
-#: ../../include/widgets.php:1500
+#: ../../Zotlabs/Module/Photos.php:792 ../../Zotlabs/Module/Photos.php:1335
+#: ../../include/widgets.php:1497
 msgid "View Photo"
 msgstr "Ver foto"
 
-#: ../../Zotlabs/Module/Photos.php:823 ../../include/widgets.php:1517
+#: ../../Zotlabs/Module/Photos.php:823 ../../include/widgets.php:1514
 msgid "Edit Album"
 msgstr "Editar álbum"
 
@@ -4123,26 +4105,26 @@ msgstr "Ejemplos: @eva, @Carmen_Osuna, @jaime@ejemplo.com"
 msgid "Flag as adult in album view"
 msgstr "Marcar como \"solo para adultos\" en el álbum"
 
-#: ../../Zotlabs/Module/Photos.php:1070 ../../include/ItemObject.php:254
+#: ../../Zotlabs/Module/Photos.php:1070 ../../Zotlabs/Lib/ThreadItem.php:251
 msgid "I like this (toggle)"
 msgstr "Me gusta (cambiar)"
 
-#: ../../Zotlabs/Module/Photos.php:1071 ../../include/ItemObject.php:255
+#: ../../Zotlabs/Module/Photos.php:1071 ../../Zotlabs/Lib/ThreadItem.php:252
 msgid "I don't like this (toggle)"
 msgstr "No me gusta esto (cambiar)"
 
-#: ../../Zotlabs/Module/Photos.php:1073 ../../include/ItemObject.php:389
+#: ../../Zotlabs/Module/Photos.php:1073 ../../Zotlabs/Lib/ThreadItem.php:386
 #: ../../include/conversation.php:740
 msgid "Please wait"
 msgstr "Espere por favor"
 
 #: ../../Zotlabs/Module/Photos.php:1089 ../../Zotlabs/Module/Photos.php:1207
-#: ../../include/ItemObject.php:700
+#: ../../Zotlabs/Lib/ThreadItem.php:696
 msgid "This is you"
 msgstr "Este es usted"
 
 #: ../../Zotlabs/Module/Photos.php:1091 ../../Zotlabs/Module/Photos.php:1209
-#: ../../include/ItemObject.php:702 ../../include/js_strings.php:6
+#: ../../Zotlabs/Lib/ThreadItem.php:698 ../../include/js_strings.php:6
 msgid "Comment"
 msgstr "Comentar"
 
@@ -4187,13 +4169,13 @@ msgid "Might attend"
 msgstr "Quizá participe"
 
 #: ../../Zotlabs/Module/Photos.php:1126 ../../Zotlabs/Module/Photos.php:1138
-#: ../../include/ItemObject.php:175 ../../include/ItemObject.php:187
-#: ../../include/conversation.php:1724
+#: ../../Zotlabs/Lib/ThreadItem.php:171 ../../Zotlabs/Lib/ThreadItem.php:183
+#: ../../include/conversation.php:1717
 msgid "View all"
 msgstr "Ver todo"
 
-#: ../../Zotlabs/Module/Photos.php:1130 ../../include/identity.php:1304
-#: ../../include/ItemObject.php:179 ../../include/conversation.php:1748
+#: ../../Zotlabs/Module/Photos.php:1130 ../../Zotlabs/Lib/ThreadItem.php:175
+#: ../../include/conversation.php:1741 ../../include/channel.php:1158
 #: ../../include/taxonomy.php:403
 msgctxt "noun"
 msgid "Like"
@@ -4201,8 +4183,8 @@ msgid_plural "Likes"
 msgstr[0] "Me gusta"
 msgstr[1] "Me gusta"
 
-#: ../../Zotlabs/Module/Photos.php:1135 ../../include/ItemObject.php:184
-#: ../../include/conversation.php:1751
+#: ../../Zotlabs/Module/Photos.php:1135 ../../Zotlabs/Lib/ThreadItem.php:180
+#: ../../include/conversation.php:1744
 msgctxt "noun"
 msgid "Dislike"
 msgid_plural "Dislikes"
@@ -4221,54 +4203,52 @@ msgstr "En esta foto:"
 msgid "Map"
 msgstr "Mapa"
 
-#: ../../Zotlabs/Module/Photos.php:1257 ../../include/ItemObject.php:378
+#: ../../Zotlabs/Module/Photos.php:1257 ../../Zotlabs/Lib/ThreadItem.php:375
 msgctxt "noun"
 msgid "Likes"
 msgstr "Me gusta"
 
-#: ../../Zotlabs/Module/Photos.php:1258 ../../include/ItemObject.php:379
+#: ../../Zotlabs/Module/Photos.php:1258 ../../Zotlabs/Lib/ThreadItem.php:376
 msgctxt "noun"
 msgid "Dislikes"
 msgstr "No me gusta"
 
-#: ../../Zotlabs/Module/Photos.php:1263 ../../include/ItemObject.php:384
-#: ../../include/acl_selectors.php:290
+#: ../../Zotlabs/Module/Photos.php:1263 ../../Zotlabs/Lib/ThreadItem.php:381
+#: ../../include/acl_selectors.php:285
 msgid "Close"
 msgstr "Cerrar"
 
-#: ../../Zotlabs/Module/Photos.php:1340
+#: ../../Zotlabs/Module/Photos.php:1341
 msgid "View Album"
 msgstr "Ver álbum"
 
-#: ../../Zotlabs/Module/Photos.php:1351 ../../Zotlabs/Module/Photos.php:1364
-#: ../../Zotlabs/Module/Photos.php:1365
+#: ../../Zotlabs/Module/Photos.php:1352 ../../Zotlabs/Module/Photos.php:1365
+#: ../../Zotlabs/Module/Photos.php:1366
 msgid "Recent Photos"
 msgstr "Fotos recientes"
 
-#: ../../Zotlabs/Module/Ping.php:264
+#: ../../Zotlabs/Module/Ping.php:265
 msgid "sent you a private message"
 msgstr "le ha enviado un mensaje privado"
 
-#: ../../Zotlabs/Module/Ping.php:312
+#: ../../Zotlabs/Module/Ping.php:313
 msgid "added your channel"
 msgstr "añadió este canal a sus conexiones"
 
-#: ../../Zotlabs/Module/Ping.php:322 ../../include/identity.php:1123
-#: ../../include/identity.php:1199
+#: ../../Zotlabs/Module/Ping.php:323
 msgid "g A l F d"
 msgstr "g A l d F"
 
-#: ../../Zotlabs/Module/Ping.php:345 ../../include/identity.php:1169
-#: ../../include/identity.php:1239
+#: ../../Zotlabs/Module/Ping.php:346
 msgid "[today]"
 msgstr "[hoy]"
 
-#: ../../Zotlabs/Module/Ping.php:354
+#: ../../Zotlabs/Module/Ping.php:355
 msgid "posted an event"
 msgstr "publicó un evento"
 
-#: ../../Zotlabs/Module/Poke.php:168 ../../include/conversation.php:965
-#: ../../include/apps.php:177
+#: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:226
+#: ../../include/conversation.php:960
 msgid "Poke"
 msgstr "Toques y otras cosas"
 
@@ -4296,7 +4276,7 @@ msgstr "Elegir qué desea enviar al destinatario"
 msgid "Make this post private"
 msgstr "Convertir en privado este envío"
 
-#: ../../Zotlabs/Module/Probe.php:28 ../../Zotlabs/Module/Probe.php:34
+#: ../../Zotlabs/Module/Probe.php:30 ../../Zotlabs/Module/Probe.php:34
 #, php-format
 msgid "Fetching URL returns error: %1$s"
 msgstr "Al intentar obtener la dirección, retorna el error: %1$s"
@@ -4311,270 +4291,270 @@ msgstr "Recargue la página o limpie el caché del navegador si la nueva foto no
 msgid "Upload Profile Photo"
 msgstr "Subir foto de perfil"
 
-#: ../../Zotlabs/Module/Profiles.php:23 ../../Zotlabs/Module/Profiles.php:188
-#: ../../Zotlabs/Module/Profiles.php:245 ../../Zotlabs/Module/Profiles.php:624
+#: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:189
+#: ../../Zotlabs/Module/Profiles.php:246 ../../Zotlabs/Module/Profiles.php:625
 msgid "Profile not found."
 msgstr "Perfil no encontrado."
 
-#: ../../Zotlabs/Module/Profiles.php:43
+#: ../../Zotlabs/Module/Profiles.php:44
 msgid "Profile deleted."
 msgstr "Perfil eliminado."
 
-#: ../../Zotlabs/Module/Profiles.php:67 ../../Zotlabs/Module/Profiles.php:103
+#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:104
 msgid "Profile-"
 msgstr "Perfil-"
 
-#: ../../Zotlabs/Module/Profiles.php:88 ../../Zotlabs/Module/Profiles.php:131
+#: ../../Zotlabs/Module/Profiles.php:89 ../../Zotlabs/Module/Profiles.php:132
 msgid "New profile created."
 msgstr "El nuevo perfil ha sido creado."
 
-#: ../../Zotlabs/Module/Profiles.php:109
+#: ../../Zotlabs/Module/Profiles.php:110
 msgid "Profile unavailable to clone."
 msgstr "Perfil no disponible para clonar."
 
-#: ../../Zotlabs/Module/Profiles.php:150
+#: ../../Zotlabs/Module/Profiles.php:151
 msgid "Profile unavailable to export."
 msgstr "Perfil no disponible para exportar."
 
-#: ../../Zotlabs/Module/Profiles.php:255
+#: ../../Zotlabs/Module/Profiles.php:256
 msgid "Profile Name is required."
 msgstr "Se necesita el nombre del perfil."
 
-#: ../../Zotlabs/Module/Profiles.php:426
+#: ../../Zotlabs/Module/Profiles.php:427
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: ../../Zotlabs/Module/Profiles.php:430
+#: ../../Zotlabs/Module/Profiles.php:431
 msgid "Romantic Partner"
 msgstr "Pareja sentimental"
 
-#: ../../Zotlabs/Module/Profiles.php:434 ../../Zotlabs/Module/Profiles.php:740
+#: ../../Zotlabs/Module/Profiles.php:435 ../../Zotlabs/Module/Profiles.php:736
 msgid "Likes"
 msgstr "Me gusta"
 
-#: ../../Zotlabs/Module/Profiles.php:438 ../../Zotlabs/Module/Profiles.php:741
+#: ../../Zotlabs/Module/Profiles.php:439 ../../Zotlabs/Module/Profiles.php:737
 msgid "Dislikes"
 msgstr "No me gusta"
 
-#: ../../Zotlabs/Module/Profiles.php:442 ../../Zotlabs/Module/Profiles.php:748
+#: ../../Zotlabs/Module/Profiles.php:443 ../../Zotlabs/Module/Profiles.php:744
 msgid "Work/Employment"
 msgstr "Trabajo:"
 
-#: ../../Zotlabs/Module/Profiles.php:445
+#: ../../Zotlabs/Module/Profiles.php:446
 msgid "Religion"
 msgstr "Religión"
 
-#: ../../Zotlabs/Module/Profiles.php:449
+#: ../../Zotlabs/Module/Profiles.php:450
 msgid "Political Views"
 msgstr "Ideas políticas"
 
-#: ../../Zotlabs/Module/Profiles.php:457
+#: ../../Zotlabs/Module/Profiles.php:458
 msgid "Sexual Preference"
 msgstr "Preferencia sexual"
 
-#: ../../Zotlabs/Module/Profiles.php:461
+#: ../../Zotlabs/Module/Profiles.php:462
 msgid "Homepage"
 msgstr "Página personal"
 
-#: ../../Zotlabs/Module/Profiles.php:465
+#: ../../Zotlabs/Module/Profiles.php:466
 msgid "Interests"
 msgstr "Intereses"
 
-#: ../../Zotlabs/Module/Profiles.php:559
+#: ../../Zotlabs/Module/Profiles.php:560
 msgid "Profile updated."
 msgstr "Perfil actualizado."
 
-#: ../../Zotlabs/Module/Profiles.php:648
+#: ../../Zotlabs/Module/Profiles.php:644
 msgid "Hide your connections list from viewers of this profile"
 msgstr "Ocultar la lista de conexiones a los visitantes del perfil"
 
-#: ../../Zotlabs/Module/Profiles.php:690
+#: ../../Zotlabs/Module/Profiles.php:686
 msgid "Edit Profile Details"
 msgstr "Modificar los detalles de este perfil"
 
-#: ../../Zotlabs/Module/Profiles.php:692
+#: ../../Zotlabs/Module/Profiles.php:688
 msgid "View this profile"
 msgstr "Ver este perfil"
 
-#: ../../Zotlabs/Module/Profiles.php:693 ../../Zotlabs/Module/Profiles.php:775
-#: ../../include/identity.php:959
+#: ../../Zotlabs/Module/Profiles.php:689 ../../Zotlabs/Module/Profiles.php:771
+#: ../../include/channel.php:959
 msgid "Edit visibility"
 msgstr "Editar visibilidad"
 
-#: ../../Zotlabs/Module/Profiles.php:694
+#: ../../Zotlabs/Module/Profiles.php:690
 msgid "Profile Tools"
 msgstr "Gestión del perfil"
 
-#: ../../Zotlabs/Module/Profiles.php:695
+#: ../../Zotlabs/Module/Profiles.php:691
 msgid "Change cover photo"
 msgstr "Cambiar la imagen de portada del perfil"
 
-#: ../../Zotlabs/Module/Profiles.php:696 ../../include/identity.php:930
+#: ../../Zotlabs/Module/Profiles.php:692 ../../include/channel.php:930
 msgid "Change profile photo"
 msgstr "Cambiar la foto del perfil"
 
-#: ../../Zotlabs/Module/Profiles.php:697
+#: ../../Zotlabs/Module/Profiles.php:693
 msgid "Create a new profile using these settings"
 msgstr "Crear un nuevo perfil usando estos ajustes"
 
-#: ../../Zotlabs/Module/Profiles.php:698
+#: ../../Zotlabs/Module/Profiles.php:694
 msgid "Clone this profile"
 msgstr "Clonar este perfil"
 
-#: ../../Zotlabs/Module/Profiles.php:699
+#: ../../Zotlabs/Module/Profiles.php:695
 msgid "Delete this profile"
 msgstr "Eliminar este perfil"
 
-#: ../../Zotlabs/Module/Profiles.php:700
+#: ../../Zotlabs/Module/Profiles.php:696
 msgid "Add profile things"
 msgstr "Añadir cosas al perfil"
 
-#: ../../Zotlabs/Module/Profiles.php:701 ../../include/widgets.php:105
-#: ../../include/conversation.php:1532
+#: ../../Zotlabs/Module/Profiles.php:697 ../../include/conversation.php:1526
+#: ../../include/widgets.php:105
 msgid "Personal"
 msgstr "Personales"
 
-#: ../../Zotlabs/Module/Profiles.php:703
+#: ../../Zotlabs/Module/Profiles.php:699
 msgid "Relation"
 msgstr "Relación"
 
-#: ../../Zotlabs/Module/Profiles.php:704 ../../include/datetime.php:48
+#: ../../Zotlabs/Module/Profiles.php:700 ../../include/datetime.php:48
 msgid "Miscellaneous"
 msgstr "Varios"
 
-#: ../../Zotlabs/Module/Profiles.php:706
+#: ../../Zotlabs/Module/Profiles.php:702
 msgid "Import profile from file"
 msgstr "Importar perfil desde un fichero"
 
-#: ../../Zotlabs/Module/Profiles.php:707
+#: ../../Zotlabs/Module/Profiles.php:703
 msgid "Export profile to file"
 msgstr "Exportar perfil a un fichero"
 
-#: ../../Zotlabs/Module/Profiles.php:708
+#: ../../Zotlabs/Module/Profiles.php:704
 msgid "Your gender"
 msgstr "Género"
 
-#: ../../Zotlabs/Module/Profiles.php:709
+#: ../../Zotlabs/Module/Profiles.php:705
 msgid "Marital status"
 msgstr "Estado civil"
 
-#: ../../Zotlabs/Module/Profiles.php:710
+#: ../../Zotlabs/Module/Profiles.php:706
 msgid "Sexual preference"
 msgstr "Preferencia sexual"
 
-#: ../../Zotlabs/Module/Profiles.php:713
+#: ../../Zotlabs/Module/Profiles.php:709
 msgid "Profile name"
 msgstr "Nombre del perfil"
 
-#: ../../Zotlabs/Module/Profiles.php:715
+#: ../../Zotlabs/Module/Profiles.php:711
 msgid "This is your default profile."
 msgstr "Este es su perfil principal."
 
-#: ../../Zotlabs/Module/Profiles.php:717
+#: ../../Zotlabs/Module/Profiles.php:713
 msgid "Your full name"
 msgstr "Nombre completo"
 
-#: ../../Zotlabs/Module/Profiles.php:718
+#: ../../Zotlabs/Module/Profiles.php:714
 msgid "Title/Description"
 msgstr "Título o descripción"
 
-#: ../../Zotlabs/Module/Profiles.php:721
+#: ../../Zotlabs/Module/Profiles.php:717
 msgid "Street address"
 msgstr "Dirección"
 
-#: ../../Zotlabs/Module/Profiles.php:722
+#: ../../Zotlabs/Module/Profiles.php:718
 msgid "Locality/City"
 msgstr "Ciudad"
 
-#: ../../Zotlabs/Module/Profiles.php:723
+#: ../../Zotlabs/Module/Profiles.php:719
 msgid "Region/State"
 msgstr "Región o Estado"
 
-#: ../../Zotlabs/Module/Profiles.php:724
+#: ../../Zotlabs/Module/Profiles.php:720
 msgid "Postal/Zip code"
 msgstr "Código postal"
 
-#: ../../Zotlabs/Module/Profiles.php:725
+#: ../../Zotlabs/Module/Profiles.php:721
 msgid "Country"
 msgstr "País"
 
-#: ../../Zotlabs/Module/Profiles.php:730
+#: ../../Zotlabs/Module/Profiles.php:726
 msgid "Who (if applicable)"
 msgstr "Quién (si es pertinente)"
 
-#: ../../Zotlabs/Module/Profiles.php:730
+#: ../../Zotlabs/Module/Profiles.php:726
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr "Por ejemplo: ana123, María González, sara@ejemplo.com"
 
-#: ../../Zotlabs/Module/Profiles.php:731
+#: ../../Zotlabs/Module/Profiles.php:727
 msgid "Since (date)"
 msgstr "Desde (fecha)"
 
-#: ../../Zotlabs/Module/Profiles.php:734
+#: ../../Zotlabs/Module/Profiles.php:730
 msgid "Tell us about yourself"
 msgstr "Háblenos de usted"
 
-#: ../../Zotlabs/Module/Profiles.php:736
+#: ../../Zotlabs/Module/Profiles.php:732
 msgid "Hometown"
 msgstr "Lugar de nacimiento"
 
-#: ../../Zotlabs/Module/Profiles.php:737
+#: ../../Zotlabs/Module/Profiles.php:733
 msgid "Political views"
 msgstr "Ideas políticas"
 
-#: ../../Zotlabs/Module/Profiles.php:738
+#: ../../Zotlabs/Module/Profiles.php:734
 msgid "Religious views"
 msgstr "Creencias religiosas"
 
-#: ../../Zotlabs/Module/Profiles.php:739
+#: ../../Zotlabs/Module/Profiles.php:735
 msgid "Keywords used in directory listings"
 msgstr "Palabras clave utilizadas en los listados de directorios"
 
-#: ../../Zotlabs/Module/Profiles.php:739
+#: ../../Zotlabs/Module/Profiles.php:735
 msgid "Example: fishing photography software"
 msgstr "Por ejemplo: software de fotografía submarina"
 
-#: ../../Zotlabs/Module/Profiles.php:742
+#: ../../Zotlabs/Module/Profiles.php:738
 msgid "Musical interests"
 msgstr "Preferencias musicales"
 
-#: ../../Zotlabs/Module/Profiles.php:743
+#: ../../Zotlabs/Module/Profiles.php:739
 msgid "Books, literature"
 msgstr "Libros, literatura"
 
-#: ../../Zotlabs/Module/Profiles.php:744
+#: ../../Zotlabs/Module/Profiles.php:740
 msgid "Television"
 msgstr "Televisión"
 
-#: ../../Zotlabs/Module/Profiles.php:745
+#: ../../Zotlabs/Module/Profiles.php:741
 msgid "Film/Dance/Culture/Entertainment"
 msgstr "Cine, danza, cultura, entretenimiento"
 
-#: ../../Zotlabs/Module/Profiles.php:746
+#: ../../Zotlabs/Module/Profiles.php:742
 msgid "Hobbies/Interests"
 msgstr "Aficiones o intereses"
 
-#: ../../Zotlabs/Module/Profiles.php:747
+#: ../../Zotlabs/Module/Profiles.php:743
 msgid "Love/Romance"
 msgstr "Vida sentimental o amorosa"
 
-#: ../../Zotlabs/Module/Profiles.php:749
+#: ../../Zotlabs/Module/Profiles.php:745
 msgid "School/Education"
 msgstr "Estudios"
 
-#: ../../Zotlabs/Module/Profiles.php:750
+#: ../../Zotlabs/Module/Profiles.php:746
 msgid "Contact information and social networks"
 msgstr "Información de contacto y redes sociales"
 
-#: ../../Zotlabs/Module/Profiles.php:751
+#: ../../Zotlabs/Module/Profiles.php:747
 msgid "My other channels"
 msgstr "Mis otros canales"
 
-#: ../../Zotlabs/Module/Profiles.php:771 ../../include/identity.php:955
+#: ../../Zotlabs/Module/Profiles.php:767 ../../include/channel.php:955
 msgid "Profile Image"
 msgstr "Imagen del perfil"
 
-#: ../../Zotlabs/Module/Profiles.php:781 ../../include/identity.php:937
+#: ../../Zotlabs/Module/Profiles.php:777 ../../include/channel.php:937
 #: ../../include/nav.php:88
 msgid "Edit Profiles"
 msgstr "Editar perfiles"
@@ -4587,7 +4567,7 @@ msgstr "Identificador del perfil no válido"
 msgid "Profile Visibility Editor"
 msgstr "Editor de visibilidad del perfil"
 
-#: ../../Zotlabs/Module/Profperm.php:117 ../../include/identity.php:1395
+#: ../../Zotlabs/Module/Profperm.php:117 ../../include/channel.php:1249
 msgid "Profile"
 msgstr "Perfil"
 
@@ -4599,7 +4579,7 @@ msgstr "Pulsar en un contacto para añadirlo o eliminarlo."
 msgid "Visible To"
 msgstr "Visible para"
 
-#: ../../Zotlabs/Module/Pubsites.php:22 ../../include/widgets.php:1271
+#: ../../Zotlabs/Module/Pubsites.php:22 ../../include/widgets.php:1268
 msgid "Public Hubs"
 msgstr "Servidores públicos"
 
@@ -4625,15 +4605,19 @@ msgid "Registration Policy"
 msgstr "Normas de registro"
 
 #: ../../Zotlabs/Module/Pubsites.php:31
+msgid "Stats"
+msgstr "Estadísticas"
+
+#: ../../Zotlabs/Module/Pubsites.php:31
 msgid "Software"
 msgstr "Software"
 
 #: ../../Zotlabs/Module/Pubsites.php:31 ../../Zotlabs/Module/Ratings.php:103
-#: ../../include/conversation.php:964
+#: ../../include/conversation.php:959
 msgid "Ratings"
 msgstr "Valoraciones"
 
-#: ../../Zotlabs/Module/Pubsites.php:37
+#: ../../Zotlabs/Module/Pubsites.php:38
 msgid "Rate"
 msgstr "Valorar"
 
@@ -4774,7 +4758,7 @@ msgid "Membership on this site is by invitation only."
 msgstr "Para registrarse en este sitio es necesaria una invitación."
 
 #: ../../Zotlabs/Module/Register.php:262 ../../include/nav.php:147
-#: ../../boot.php:1611
+#: ../../boot.php:1677
 msgid "Register"
 msgstr "Registrarse"
 
@@ -4792,44 +4776,44 @@ msgid ""
 "password."
 msgstr "La eliminación de cuentas no está permitida hasta después de que hayan transcurrido 48 horas desde el último cambio de contraseña."
 
-#: ../../Zotlabs/Module/Removeaccount.php:61
+#: ../../Zotlabs/Module/Removeaccount.php:56
 msgid "Remove This Account"
 msgstr "Eliminar esta cuenta"
 
-#: ../../Zotlabs/Module/Removeaccount.php:62
-#: ../../Zotlabs/Module/Removeme.php:62
+#: ../../Zotlabs/Module/Removeaccount.php:57
+#: ../../Zotlabs/Module/Removeme.php:59
 msgid "WARNING: "
 msgstr "ATENCIÓN:"
 
-#: ../../Zotlabs/Module/Removeaccount.php:62
+#: ../../Zotlabs/Module/Removeaccount.php:57
 msgid ""
 "This account and all its channels will be completely removed from the "
 "network. "
 msgstr "Esta cuenta y todos sus canales van a ser eliminados de la red."
 
-#: ../../Zotlabs/Module/Removeaccount.php:62
-#: ../../Zotlabs/Module/Removeme.php:62
+#: ../../Zotlabs/Module/Removeaccount.php:57
+#: ../../Zotlabs/Module/Removeme.php:59
 msgid "This action is permanent and can not be undone!"
 msgstr "¡Esta acción tiene carácter definitivo y no se puede deshacer!"
 
-#: ../../Zotlabs/Module/Removeaccount.php:63
-#: ../../Zotlabs/Module/Removeme.php:63
+#: ../../Zotlabs/Module/Removeaccount.php:58
+#: ../../Zotlabs/Module/Removeme.php:60
 msgid "Please enter your password for verification:"
 msgstr "Por favor, introduzca su contraseña para su verificación:"
 
-#: ../../Zotlabs/Module/Removeaccount.php:64
+#: ../../Zotlabs/Module/Removeaccount.php:59
 msgid ""
 "Remove this account, all its channels and all its channel clones from the "
 "network"
 msgstr "Remover esta cuenta, todos sus canales y clones de la red"
 
-#: ../../Zotlabs/Module/Removeaccount.php:64
+#: ../../Zotlabs/Module/Removeaccount.php:59
 msgid ""
 "By default only the instances of the channels located on this hub will be "
 "removed from the network"
 msgstr "Por defecto, solo las instancias de los canales ubicados en este servidor serán eliminados de la red"
 
-#: ../../Zotlabs/Module/Removeaccount.php:65
+#: ../../Zotlabs/Module/Removeaccount.php:60
 #: ../../Zotlabs/Module/Settings.php:705
 msgid "Remove Account"
 msgstr "Eliminar cuenta"
@@ -4840,25 +4824,25 @@ msgid ""
 "password."
 msgstr "La eliminación de canales no está permitida hasta pasadas 48 horas desde el último cambio de contraseña."
 
-#: ../../Zotlabs/Module/Removeme.php:61
+#: ../../Zotlabs/Module/Removeme.php:58
 msgid "Remove This Channel"
 msgstr "Eliminar este canal"
 
-#: ../../Zotlabs/Module/Removeme.php:62
+#: ../../Zotlabs/Module/Removeme.php:59
 msgid "This channel will be completely removed from the network. "
 msgstr "Este canal va a ser completamente eliminado de la red."
 
-#: ../../Zotlabs/Module/Removeme.php:64
+#: ../../Zotlabs/Module/Removeme.php:61
 msgid "Remove this channel and all its clones from the network"
 msgstr "Eliminar este canal y todos sus clones de la red"
 
-#: ../../Zotlabs/Module/Removeme.php:64
+#: ../../Zotlabs/Module/Removeme.php:61
 msgid ""
 "By default only the instance of the channel located on this hub will be "
 "removed from the network"
 msgstr "Por defecto, solo la instancia del canal alojado en este servidor será eliminado de la red"
 
-#: ../../Zotlabs/Module/Removeme.php:65 ../../Zotlabs/Module/Settings.php:1124
+#: ../../Zotlabs/Module/Removeme.php:62 ../../Zotlabs/Module/Settings.php:1124
 msgid "Remove Channel"
 msgstr "Eliminar el canal"
 
@@ -5202,7 +5186,7 @@ msgstr "Ajustes del canal"
 msgid "Basic Settings"
 msgstr "Configuración básica"
 
-#: ../../Zotlabs/Module/Settings.php:1040 ../../include/identity.php:1286
+#: ../../Zotlabs/Module/Settings.php:1040 ../../include/channel.php:1140
 msgid "Full Name:"
 msgstr "Nombre completo:"
 
@@ -5508,428 +5492,428 @@ msgstr "Servicio de compartición de Firefox: proveedor $Projectname"
 msgid "Start calendar week on monday"
 msgstr "Comenzar el calendario semanal por el lunes"
 
-#: ../../Zotlabs/Module/Setup.php:202
+#: ../../Zotlabs/Module/Setup.php:179
 msgid "$Projectname Server - Setup"
 msgstr "Servidor $Projectname  - Instalación"
 
-#: ../../Zotlabs/Module/Setup.php:206
+#: ../../Zotlabs/Module/Setup.php:183
 msgid "Could not connect to database."
 msgstr "No se ha podido conectar a la base de datos."
 
-#: ../../Zotlabs/Module/Setup.php:210
+#: ../../Zotlabs/Module/Setup.php:187
 msgid ""
 "Could not connect to specified site URL. Possible SSL certificate or DNS "
 "issue."
 msgstr "No se puede conectar con la dirección del sitio indicada. Podría tratarse de un problema de SSL o DNS."
 
-#: ../../Zotlabs/Module/Setup.php:217
+#: ../../Zotlabs/Module/Setup.php:194
 msgid "Could not create table."
 msgstr "No se puede crear la tabla."
 
-#: ../../Zotlabs/Module/Setup.php:222
+#: ../../Zotlabs/Module/Setup.php:199
 msgid "Your site database has been installed."
 msgstr "La base de datos del sitio ha sido instalada."
 
-#: ../../Zotlabs/Module/Setup.php:226
+#: ../../Zotlabs/Module/Setup.php:203
 msgid ""
 "You may need to import the file \"install/schema_xxx.sql\" manually using a "
 "database client."
 msgstr "Podría tener que importar manualmente el fichero \"install/schema_xxx.sql\" usando un cliente de base de datos."
 
-#: ../../Zotlabs/Module/Setup.php:227 ../../Zotlabs/Module/Setup.php:289
-#: ../../Zotlabs/Module/Setup.php:744
+#: ../../Zotlabs/Module/Setup.php:204 ../../Zotlabs/Module/Setup.php:266
+#: ../../Zotlabs/Module/Setup.php:721
 msgid "Please see the file \"install/INSTALL.txt\"."
 msgstr "Por favor, lea el fichero \"install/INSTALL.txt\"."
 
-#: ../../Zotlabs/Module/Setup.php:286
+#: ../../Zotlabs/Module/Setup.php:263
 msgid "System check"
 msgstr "Verificación del sistema"
 
-#: ../../Zotlabs/Module/Setup.php:291
+#: ../../Zotlabs/Module/Setup.php:268
 msgid "Check again"
 msgstr "Verificar de nuevo"
 
-#: ../../Zotlabs/Module/Setup.php:313
+#: ../../Zotlabs/Module/Setup.php:290
 msgid "Database connection"
 msgstr "Conexión a la base de datos"
 
-#: ../../Zotlabs/Module/Setup.php:314
+#: ../../Zotlabs/Module/Setup.php:291
 msgid ""
 "In order to install $Projectname we need to know how to connect to your "
 "database."
 msgstr "Para instalar $Projectname es necesario saber cómo conectar con su base de datos."
 
-#: ../../Zotlabs/Module/Setup.php:315
+#: ../../Zotlabs/Module/Setup.php:292
 msgid ""
 "Please contact your hosting provider or site administrator if you have "
 "questions about these settings."
 msgstr "Por favor, contacte con el proveedor de servicios o el administrador del sitio si tiene dudas sobre estos ajustes."
 
-#: ../../Zotlabs/Module/Setup.php:316
+#: ../../Zotlabs/Module/Setup.php:293
 msgid ""
 "The database you specify below should already exist. If it does not, please "
 "create it before continuing."
 msgstr "La base de datos que especifique a continuación debe existir ya. Si no es así, por favor, créela antes de seguir."
 
-#: ../../Zotlabs/Module/Setup.php:320
+#: ../../Zotlabs/Module/Setup.php:297
 msgid "Database Server Name"
 msgstr "Nombre del servidor de base de datos"
 
-#: ../../Zotlabs/Module/Setup.php:320
+#: ../../Zotlabs/Module/Setup.php:297
 msgid "Default is 127.0.0.1"
 msgstr "De forma predeterminada es 127.0.0.1"
 
-#: ../../Zotlabs/Module/Setup.php:321
+#: ../../Zotlabs/Module/Setup.php:298
 msgid "Database Port"
 msgstr "Puerto de la base de datos"
 
-#: ../../Zotlabs/Module/Setup.php:321
+#: ../../Zotlabs/Module/Setup.php:298
 msgid "Communication port number - use 0 for default"
 msgstr "Número del puerto de comunicaciones - use 0 como valor por defecto"
 
-#: ../../Zotlabs/Module/Setup.php:322
+#: ../../Zotlabs/Module/Setup.php:299
 msgid "Database Login Name"
 msgstr "Usuario de la base de datos"
 
-#: ../../Zotlabs/Module/Setup.php:323
+#: ../../Zotlabs/Module/Setup.php:300
 msgid "Database Login Password"
 msgstr "Contraseña de acceso a la base de datos"
 
-#: ../../Zotlabs/Module/Setup.php:324
+#: ../../Zotlabs/Module/Setup.php:301
 msgid "Database Name"
 msgstr "Nombre de la base de datos"
 
-#: ../../Zotlabs/Module/Setup.php:325
+#: ../../Zotlabs/Module/Setup.php:302
 msgid "Database Type"
 msgstr "Tipo de base de datos"
 
-#: ../../Zotlabs/Module/Setup.php:327 ../../Zotlabs/Module/Setup.php:367
+#: ../../Zotlabs/Module/Setup.php:304 ../../Zotlabs/Module/Setup.php:344
 msgid "Site administrator email address"
 msgstr "Dirección de correo electrónico del administrador del sitio"
 
-#: ../../Zotlabs/Module/Setup.php:327 ../../Zotlabs/Module/Setup.php:367
+#: ../../Zotlabs/Module/Setup.php:304 ../../Zotlabs/Module/Setup.php:344
 msgid ""
 "Your account email address must match this in order to use the web admin "
 "panel."
 msgstr "Su cuenta deberá usar la misma dirección de correo electrónico para poder utilizar el panel de administración web."
 
-#: ../../Zotlabs/Module/Setup.php:328 ../../Zotlabs/Module/Setup.php:369
+#: ../../Zotlabs/Module/Setup.php:305 ../../Zotlabs/Module/Setup.php:346
 msgid "Website URL"
 msgstr "Dirección del sitio web"
 
-#: ../../Zotlabs/Module/Setup.php:328 ../../Zotlabs/Module/Setup.php:369
+#: ../../Zotlabs/Module/Setup.php:305 ../../Zotlabs/Module/Setup.php:346
 msgid "Please use SSL (https) URL if available."
 msgstr "Por favor, use SSL (https) si está disponible."
 
-#: ../../Zotlabs/Module/Setup.php:329 ../../Zotlabs/Module/Setup.php:372
+#: ../../Zotlabs/Module/Setup.php:306 ../../Zotlabs/Module/Setup.php:349
 msgid "Please select a default timezone for your website"
 msgstr "Por favor, selecciones el huso horario por defecto de su sitio web"
 
-#: ../../Zotlabs/Module/Setup.php:356
+#: ../../Zotlabs/Module/Setup.php:333
 msgid "Site settings"
 msgstr "Ajustes del sitio"
 
-#: ../../Zotlabs/Module/Setup.php:370
+#: ../../Zotlabs/Module/Setup.php:347
 msgid "Enable $Projectname <strong>advanced</strong> features?"
 msgstr "¿Habilitar las funcionalidades <strong>avanzadas</strong> de $Projectname ?"
 
-#: ../../Zotlabs/Module/Setup.php:370
+#: ../../Zotlabs/Module/Setup.php:347
 msgid ""
 "Some advanced features, while useful - may be best suited for technically "
 "proficient audiences"
 msgstr "Algunas funcionalidades avanzadas, si bien son útiles, pueden ser más adecuadas para un público técnicamente competente"
 
-#: ../../Zotlabs/Module/Setup.php:411
-msgid "PHP version 5.4 or greater is required."
-msgstr "Se requiere la versión 5.4, o superior, de PHP."
+#: ../../Zotlabs/Module/Setup.php:388
+msgid "PHP version 5.5 or greater is required."
+msgstr "Se requiere la versión 5.5, o superior, de PHP."
 
-#: ../../Zotlabs/Module/Setup.php:412
+#: ../../Zotlabs/Module/Setup.php:389
 msgid "PHP version"
 msgstr "Versión de PHP"
 
-#: ../../Zotlabs/Module/Setup.php:427
+#: ../../Zotlabs/Module/Setup.php:404
 msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr "No se puede encontrar una versión en línea de comandos de PHP en la ruta del servidor web."
 
-#: ../../Zotlabs/Module/Setup.php:428
+#: ../../Zotlabs/Module/Setup.php:405
 msgid ""
 "If you don't have a command line version of PHP installed on server, you "
 "will not be able to run background polling via cron."
 msgstr "Si no tiene instalada la versión de línea de comandos de PHP en su servidor, no podrá realizar envíos en segundo plano mediante cron."
 
-#: ../../Zotlabs/Module/Setup.php:432
+#: ../../Zotlabs/Module/Setup.php:409
 msgid "PHP executable path"
 msgstr "Ruta del ejecutable PHP"
 
-#: ../../Zotlabs/Module/Setup.php:432
+#: ../../Zotlabs/Module/Setup.php:409
 msgid ""
 "Enter full path to php executable. You can leave this blank to continue the "
 "installation."
 msgstr "Introducir la ruta completa del ejecutable PHP. Puede dejar la línea en blanco para continuar la instalación."
 
-#: ../../Zotlabs/Module/Setup.php:437
+#: ../../Zotlabs/Module/Setup.php:414
 msgid "Command line PHP"
 msgstr "PHP en línea de comandos"
 
-#: ../../Zotlabs/Module/Setup.php:446
+#: ../../Zotlabs/Module/Setup.php:423
 msgid ""
 "The command line version of PHP on your system does not have "
 "\"register_argc_argv\" enabled."
 msgstr "La línea de comandos PHP de su sistema no tiene activado \"register_argc_argv\"."
 
-#: ../../Zotlabs/Module/Setup.php:447
+#: ../../Zotlabs/Module/Setup.php:424
 msgid "This is required for message delivery to work."
 msgstr "Esto es necesario para que funcione la transmisión de mensajes."
 
-#: ../../Zotlabs/Module/Setup.php:450
+#: ../../Zotlabs/Module/Setup.php:427
 msgid "PHP register_argc_argv"
 msgstr "PHP register_argc_argv"
 
-#: ../../Zotlabs/Module/Setup.php:468
+#: ../../Zotlabs/Module/Setup.php:445
 #, php-format
 msgid ""
 "Your max allowed total upload size is set to %s. Maximum size of one file to"
 " upload is set to %s. You are allowed to upload up to %d files at once."
 msgstr "La carga máxima que se le permite subir está establecida en %s. El tamaño máximo de un fichero está establecido en %s. Está permitido subir hasta un máximo de %d ficheros de una sola vez."
 
-#: ../../Zotlabs/Module/Setup.php:473
+#: ../../Zotlabs/Module/Setup.php:450
 msgid "You can adjust these settings in the servers php.ini."
 msgstr "Puede ajustar estos valores en el fichero php.ini de su servidor."
 
-#: ../../Zotlabs/Module/Setup.php:475
+#: ../../Zotlabs/Module/Setup.php:452
 msgid "PHP upload limits"
 msgstr "Límites PHP de subida"
 
-#: ../../Zotlabs/Module/Setup.php:498
+#: ../../Zotlabs/Module/Setup.php:475
 msgid ""
 "Error: the \"openssl_pkey_new\" function on this system is not able to "
 "generate encryption keys"
 msgstr "Error: La función \"openssl_pkey_new\" en este sistema no es capaz de general claves de cifrado."
 
-#: ../../Zotlabs/Module/Setup.php:499
+#: ../../Zotlabs/Module/Setup.php:476
 msgid ""
 "If running under Windows, please see "
 "\"http://www.php.net/manual/en/openssl.installation.php\"."
 msgstr "Si está en un servidor Windows, por favor, lea \"http://www.php.net/manual/en/openssl.installation.php\"."
 
-#: ../../Zotlabs/Module/Setup.php:502
+#: ../../Zotlabs/Module/Setup.php:479
 msgid "Generate encryption keys"
 msgstr "Generar claves de cifrado"
 
-#: ../../Zotlabs/Module/Setup.php:514
+#: ../../Zotlabs/Module/Setup.php:491
 msgid "libCurl PHP module"
 msgstr "módulo libCurl PHP"
 
-#: ../../Zotlabs/Module/Setup.php:515
+#: ../../Zotlabs/Module/Setup.php:492
 msgid "GD graphics PHP module"
 msgstr "módulo PHP GD graphics"
 
-#: ../../Zotlabs/Module/Setup.php:516
+#: ../../Zotlabs/Module/Setup.php:493
 msgid "OpenSSL PHP module"
 msgstr "módulo PHP OpenSSL"
 
-#: ../../Zotlabs/Module/Setup.php:517
+#: ../../Zotlabs/Module/Setup.php:494
 msgid "mysqli or postgres PHP module"
 msgstr "módulo PHP mysqli o postgres"
 
-#: ../../Zotlabs/Module/Setup.php:518
+#: ../../Zotlabs/Module/Setup.php:495
 msgid "mb_string PHP module"
 msgstr "módulo PHP mb_string"
 
-#: ../../Zotlabs/Module/Setup.php:519
+#: ../../Zotlabs/Module/Setup.php:496
 msgid "mcrypt PHP module"
 msgstr "módulo PHP mcrypt "
 
-#: ../../Zotlabs/Module/Setup.php:520
+#: ../../Zotlabs/Module/Setup.php:497
 msgid "xml PHP module"
 msgstr "módulo PHP xml"
 
-#: ../../Zotlabs/Module/Setup.php:524 ../../Zotlabs/Module/Setup.php:526
+#: ../../Zotlabs/Module/Setup.php:501 ../../Zotlabs/Module/Setup.php:503
 msgid "Apache mod_rewrite module"
 msgstr "módulo Apache mod_rewrite "
 
-#: ../../Zotlabs/Module/Setup.php:524
+#: ../../Zotlabs/Module/Setup.php:501
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr "Error: se necesita el módulo del servidor web Apache mod-rewrite pero no está instalado."
 
-#: ../../Zotlabs/Module/Setup.php:530 ../../Zotlabs/Module/Setup.php:533
+#: ../../Zotlabs/Module/Setup.php:507 ../../Zotlabs/Module/Setup.php:510
 msgid "proc_open"
 msgstr "proc_open"
 
-#: ../../Zotlabs/Module/Setup.php:530
+#: ../../Zotlabs/Module/Setup.php:507
 msgid ""
 "Error: proc_open is required but is either not installed or has been "
 "disabled in php.ini"
 msgstr "Error: se necesita proc_open pero o no está instalado o ha sido desactivado en el fichero php.ini"
 
-#: ../../Zotlabs/Module/Setup.php:538
+#: ../../Zotlabs/Module/Setup.php:515
 msgid "Error: libCURL PHP module required but not installed."
 msgstr "Error: se necesita el módulo PHP libCURL pero no está instalado."
 
-#: ../../Zotlabs/Module/Setup.php:542
+#: ../../Zotlabs/Module/Setup.php:519
 msgid ""
 "Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr "Error: el módulo PHP GD graphics es necesario, pero no está instalado."
 
-#: ../../Zotlabs/Module/Setup.php:546
+#: ../../Zotlabs/Module/Setup.php:523
 msgid "Error: openssl PHP module required but not installed."
 msgstr "Error: el módulo PHP openssl es necesario, pero no está instalado."
 
-#: ../../Zotlabs/Module/Setup.php:550
+#: ../../Zotlabs/Module/Setup.php:527
 msgid ""
 "Error: mysqli or postgres PHP module required but neither are installed."
 msgstr "Error: el módulo PHP mysqli o postgres es necesario pero ninguno de los dos está instalado."
 
-#: ../../Zotlabs/Module/Setup.php:554
+#: ../../Zotlabs/Module/Setup.php:531
 msgid "Error: mb_string PHP module required but not installed."
 msgstr "Error: el módulo PHP mb_string es necesario, pero no está instalado."
 
-#: ../../Zotlabs/Module/Setup.php:558
+#: ../../Zotlabs/Module/Setup.php:535
 msgid "Error: mcrypt PHP module required but not installed."
 msgstr "Error: el módulo PHP mcrypt es necesario, pero no está instalado."
 
-#: ../../Zotlabs/Module/Setup.php:562
+#: ../../Zotlabs/Module/Setup.php:539
 msgid "Error: xml PHP module required for DAV but not installed."
 msgstr "Error: el módulo PHP xml es necesario para DAV, pero no está instalado."
 
-#: ../../Zotlabs/Module/Setup.php:580
+#: ../../Zotlabs/Module/Setup.php:557
 msgid ""
 "The web installer needs to be able to create a file called \".htconfig.php\""
 " in the top folder of your web server and it is unable to do so."
 msgstr "El instalador web no ha podido crear un fichero llamado “.htconfig.php” en la carpeta base de su servidor."
 
-#: ../../Zotlabs/Module/Setup.php:581
+#: ../../Zotlabs/Module/Setup.php:558
 msgid ""
 "This is most often a permission setting, as the web server may not be able "
 "to write files in your folder - even if you can."
 msgstr "Esto está generalmente ligado a un problema de permisos, a causa del cual el servidor web tiene prohibido modificar ficheros en su carpeta - incluso si usted mismo tiene esos permisos."
 
-#: ../../Zotlabs/Module/Setup.php:582
+#: ../../Zotlabs/Module/Setup.php:559
 msgid ""
 "At the end of this procedure, we will give you a text to save in a file "
 "named .htconfig.php in your Red top folder."
 msgstr "Al término de este procedimiento, podemos crear un fichero de texto para guardar con el nombre .htconfig.php en el directorio raíz de su instalación de Hubzilla."
 
-#: ../../Zotlabs/Module/Setup.php:583
+#: ../../Zotlabs/Module/Setup.php:560
 msgid ""
 "You can alternatively skip this procedure and perform a manual installation."
 " Please see the file \"install/INSTALL.txt\" for instructions."
 msgstr "Como alternativa, puede dejar este procedimiento e intentar realizar una instalación manual. Lea, por favor, el fichero\"install/INSTALL.txt\" para las instrucciones."
 
-#: ../../Zotlabs/Module/Setup.php:586
+#: ../../Zotlabs/Module/Setup.php:563
 msgid ".htconfig.php is writable"
 msgstr ".htconfig.php tiene permisos de escritura"
 
-#: ../../Zotlabs/Module/Setup.php:600
+#: ../../Zotlabs/Module/Setup.php:577
 msgid ""
 "Red uses the Smarty3 template engine to render its web views. Smarty3 "
 "compiles templates to PHP to speed up rendering."
 msgstr "Hubzilla hace uso del motor de plantillas Smarty3 para diseñar sus plantillas gráficas. Smarty3 es más rápido porque compila las plantillas de páginas directamente en PHP."
 
-#: ../../Zotlabs/Module/Setup.php:601
+#: ../../Zotlabs/Module/Setup.php:578
 #, php-format
 msgid ""
 "In order to store these compiled templates, the web server needs to have "
-"write access to the directory %s under the Red top level folder."
-msgstr "Para poder guardar las plantillas compiladas, el servidor web necesita permisos para acceder al subdirectorio %s en el directorio de instalación de Hubzilla."
+"write access to the directory %s under the top level web folder."
+msgstr "Para poder guardar las plantillas compiladas, el servidor web necesita permisos para acceder al directorio %s en la carpeta web principal."
 
-#: ../../Zotlabs/Module/Setup.php:602 ../../Zotlabs/Module/Setup.php:623
+#: ../../Zotlabs/Module/Setup.php:579 ../../Zotlabs/Module/Setup.php:600
 msgid ""
 "Please ensure that the user that your web server runs as (e.g. www-data) has"
 " write access to this folder."
 msgstr "Por favor, asegúrese de que el servidor web está siendo ejecutado por un usuario que tenga permisos de escritura sobre esta carpeta (por ejemplo, www-data)."
 
-#: ../../Zotlabs/Module/Setup.php:603
+#: ../../Zotlabs/Module/Setup.php:580
 #, php-format
 msgid ""
 "Note: as a security measure, you should give the web server write access to "
 "%s only--not the template files (.tpl) that it contains."
 msgstr "Nota: como medida de seguridad, debe dar al servidor web permisos de escritura solo sobre %s - no sobre el fichero de plantilla (.tpl) que contiene."
 
-#: ../../Zotlabs/Module/Setup.php:606
+#: ../../Zotlabs/Module/Setup.php:583
 #, php-format
 msgid "%s is writable"
 msgstr "%s tiene permisos de escritura"
 
-#: ../../Zotlabs/Module/Setup.php:622
+#: ../../Zotlabs/Module/Setup.php:599
 msgid ""
 "Red uses the store directory to save uploaded files. The web server needs to"
 " have write access to the store directory under the Red top level folder"
 msgstr "Hubzilla guarda los ficheros descargados en la carpeta \"store\". El servidor web necesita tener permisos de escritura sobre esa carpeta, en el directorio de instalación."
 
-#: ../../Zotlabs/Module/Setup.php:626
+#: ../../Zotlabs/Module/Setup.php:603
 msgid "store is writable"
 msgstr "\"store\" tiene permisos de escritura"
 
-#: ../../Zotlabs/Module/Setup.php:659
+#: ../../Zotlabs/Module/Setup.php:636
 msgid ""
 "SSL certificate cannot be validated. Fix certificate or disable https access"
 " to this site."
 msgstr "El certificado SSL no ha podido ser validado. Corrija este problema o desactive el acceso https a este sitio."
 
-#: ../../Zotlabs/Module/Setup.php:660
+#: ../../Zotlabs/Module/Setup.php:637
 msgid ""
 "If you have https access to your website or allow connections to TCP port "
 "443 (the https: port), you MUST use a browser-valid certificate. You MUST "
 "NOT use self-signed certificates!"
 msgstr "Si su servidor soporta conexiones cifradas SSL o si permite conexiones al puerto TCP 443 (el puerto usado por el protocolo https), debe utilizar un certificado válido. No debe usar un certificado firmado por usted mismo."
 
-#: ../../Zotlabs/Module/Setup.php:661
+#: ../../Zotlabs/Module/Setup.php:638
 msgid ""
 "This restriction is incorporated because public posts from you may for "
 "example contain references to images on your own hub."
 msgstr "Se ha incorporado esta restricción para evitar que sus publicaciones públicas hagan referencia a imágenes en su propio servidor."
 
-#: ../../Zotlabs/Module/Setup.php:662
+#: ../../Zotlabs/Module/Setup.php:639
 msgid ""
 "If your certificate is not recognized, members of other sites (who may "
 "themselves have valid certificates) will get a warning message on their own "
 "site complaining about security issues."
 msgstr "Si su certificado no ha sido reconocido, los miembros de otros sitios (con certificados válidos) recibirán mensajes de aviso en sus propios sitios web."
 
-#: ../../Zotlabs/Module/Setup.php:663
+#: ../../Zotlabs/Module/Setup.php:640
 msgid ""
 "This can cause usability issues elsewhere (not just on your own site) so we "
 "must insist on this requirement."
 msgstr "Por razones de compatibilidad (sobre el conjunto de la red, no solo sobre su propio sitio), debemos insistir en estos requisitos."
 
-#: ../../Zotlabs/Module/Setup.php:664
+#: ../../Zotlabs/Module/Setup.php:641
 msgid ""
 "Providers are available that issue free certificates which are browser-"
 "valid."
 msgstr "Existen varias Autoridades de Certificación que le pueden proporcionar certificados válidos."
 
-#: ../../Zotlabs/Module/Setup.php:666
+#: ../../Zotlabs/Module/Setup.php:643
 msgid "SSL certificate validation"
 msgstr "validación del certificado SSL"
 
-#: ../../Zotlabs/Module/Setup.php:672
+#: ../../Zotlabs/Module/Setup.php:649
 msgid ""
 "Url rewrite in .htaccess is not working. Check your server "
 "configuration.Test: "
 msgstr "No se pueden reescribir las direcciones web en .htaccess. Compruebe la configuración de su servidor:"
 
-#: ../../Zotlabs/Module/Setup.php:675
+#: ../../Zotlabs/Module/Setup.php:652
 msgid "Url rewrite is working"
 msgstr "La reescritura de las direcciones funciona correctamente"
 
-#: ../../Zotlabs/Module/Setup.php:684
+#: ../../Zotlabs/Module/Setup.php:661
 msgid ""
 "The database configuration file \".htconfig.php\" could not be written. "
 "Please use the enclosed text to create a configuration file in your web "
 "server root."
 msgstr "El fichero de configuración de la base de datos .htconfig.php no se ha podido modificar. Por favor, copie el texto generado en un fichero con ese nombre en el directorio raíz de su servidor."
 
-#: ../../Zotlabs/Module/Setup.php:708
+#: ../../Zotlabs/Module/Setup.php:685
 msgid "Errors encountered creating database tables."
 msgstr "Se han encontrado errores al crear las tablas de la base de datos."
 
-#: ../../Zotlabs/Module/Setup.php:742
+#: ../../Zotlabs/Module/Setup.php:719
 msgid "<h1>What next</h1>"
 msgstr "<h1>Siguiente paso</h1>"
 
-#: ../../Zotlabs/Module/Setup.php:743
+#: ../../Zotlabs/Module/Setup.php:720
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the "
 "poller."
@@ -6103,12 +6087,12 @@ msgstr "No hay sugerencias disponibles. Si es un sitio nuevo, espere 24 horas y
 msgid "Ignore/Hide"
 msgstr "Ignorar/Ocultar"
 
-#: ../../Zotlabs/Module/Tagger.php:55 ../../include/bbcode.php:257
+#: ../../Zotlabs/Module/Tagger.php:55 ../../include/bbcode.php:256
 msgid "post"
 msgstr "la entrada"
 
 #: ../../Zotlabs/Module/Tagger.php:57 ../../include/conversation.php:150
-#: ../../include/text.php:1960
+#: ../../include/text.php:1933
 msgid "comment"
 msgstr "el comentario"
 
@@ -6244,16 +6228,16 @@ msgid ""
 " please import or restore these in date order (oldest first)."
 msgstr "Estos ficheros pueden ser importados o restaurados visitando <a href=\"%1$s\">%2$s</a> o cualquier sitio que contenga su canal. Para obtener los mejores resultados, por favor, importar o restaurar estos ficheros en orden de fecha (la más antigua primero)."
 
-#: ../../Zotlabs/Module/Viewconnections.php:63
+#: ../../Zotlabs/Module/Viewconnections.php:62
 msgid "No connections."
 msgstr "Sin conexiones."
 
-#: ../../Zotlabs/Module/Viewconnections.php:76
+#: ../../Zotlabs/Module/Viewconnections.php:75
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr "Visitar el perfil de %s [%s]"
 
-#: ../../Zotlabs/Module/Viewconnections.php:105
+#: ../../Zotlabs/Module/Viewconnections.php:104
 msgid "View Connections"
 msgstr "Ver conexiones"
 
@@ -6261,8 +6245,8 @@ msgstr "Ver conexiones"
 msgid "Source of Item"
 msgstr "Origen del elemento"
 
-#: ../../Zotlabs/Module/Webpages.php:184 ../../include/nav.php:106
-#: ../../include/conversation.php:1692 ../../include/apps.php:168
+#: ../../Zotlabs/Module/Webpages.php:184 ../../Zotlabs/Lib/Apps.php:217
+#: ../../include/conversation.php:1685 ../../include/nav.php:106
 msgid "Webpages"
 msgstr "Páginas web"
 
@@ -6286,866 +6270,1518 @@ msgstr "Búsqueda de canales"
 msgid "Lookup xchan beginning with (or webbie): "
 msgstr "Buscar un canal (o un \"webbie\") que comience por:"
 
-#: ../../include/Import/import_diaspora.php:17
-msgid "No username found in import file."
-msgstr "No se ha encontrado el nombre de usuario en el fichero importado."
+#: ../../Zotlabs/Lib/Apps.php:204
+msgid "Site Admin"
+msgstr "Administrador del sitio"
 
-#: ../../include/Import/import_diaspora.php:42 ../../include/import.php:48
-msgid "Unable to create a unique channel address. Import failed."
-msgstr "No se ha podido crear una dirección de canal única. Ha fallado la importación."
+#: ../../Zotlabs/Lib/Apps.php:205
+msgid "Bug Report"
+msgstr "Informe de errores"
+
+#: ../../Zotlabs/Lib/Apps.php:206
+msgid "View Bookmarks"
+msgstr "Ver los marcadores"
+
+#: ../../Zotlabs/Lib/Apps.php:207
+msgid "My Chatrooms"
+msgstr "Mis salas de chat"
+
+#: ../../Zotlabs/Lib/Apps.php:209
+msgid "Firefox Share"
+msgstr "Servicio de compartición de Firefox"
+
+#: ../../Zotlabs/Lib/Apps.php:210
+msgid "Remote Diagnostics"
+msgstr "Diagnóstico remoto"
+
+#: ../../Zotlabs/Lib/Apps.php:211 ../../include/features.php:89
+msgid "Suggest Channels"
+msgstr "Sugerir canales"
+
+#: ../../Zotlabs/Lib/Apps.php:212 ../../include/nav.php:110
+#: ../../boot.php:1695
+msgid "Login"
+msgstr "Iniciar sesión"
+
+#: ../../Zotlabs/Lib/Apps.php:214 ../../include/nav.php:179
+msgid "Grid"
+msgstr "Red"
+
+#: ../../Zotlabs/Lib/Apps.php:218 ../../include/nav.php:182
+msgid "Channel Home"
+msgstr "Mi canal"
+
+#: ../../Zotlabs/Lib/Apps.php:221 ../../include/conversation.php:1649
+#: ../../include/conversation.php:1652 ../../include/nav.php:201
+msgid "Events"
+msgstr "Eventos"
+
+#: ../../Zotlabs/Lib/Apps.php:222 ../../include/nav.php:167
+msgid "Directory"
+msgstr "Directorio"
+
+#: ../../Zotlabs/Lib/Apps.php:224 ../../include/nav.php:193
+msgid "Mail"
+msgstr "Correo"
+
+#: ../../Zotlabs/Lib/Apps.php:227 ../../include/nav.php:96
+msgid "Chat"
+msgstr "Chat"
+
+#: ../../Zotlabs/Lib/Apps.php:229
+msgid "Probe"
+msgstr "Probar"
+
+#: ../../Zotlabs/Lib/Apps.php:230
+msgid "Suggest"
+msgstr "Sugerir"
+
+#: ../../Zotlabs/Lib/Apps.php:231
+msgid "Random Channel"
+msgstr "Canal aleatorio"
+
+#: ../../Zotlabs/Lib/Apps.php:232
+msgid "Invite"
+msgstr "Invitar"
+
+#: ../../Zotlabs/Lib/Apps.php:233 ../../include/widgets.php:1384
+msgid "Features"
+msgstr "Funcionalidades"
+
+#: ../../Zotlabs/Lib/Apps.php:235
+msgid "Post"
+msgstr "Publicación"
+
+#: ../../Zotlabs/Lib/Apps.php:335
+msgid "Purchase"
+msgstr "Comprar"
+
+#: ../../Zotlabs/Lib/Chatroom.php:27
+msgid "Missing room name"
+msgstr "Sala de chat sin nombre"
+
+#: ../../Zotlabs/Lib/Chatroom.php:36
+msgid "Duplicate room name"
+msgstr "Nombre de sala duplicado."
 
-#: ../../include/dba/dba_driver.php:159
+#: ../../Zotlabs/Lib/Chatroom.php:86 ../../Zotlabs/Lib/Chatroom.php:94
+msgid "Invalid room specifier."
+msgstr "Especificador de sala no válido."
+
+#: ../../Zotlabs/Lib/Chatroom.php:126
+msgid "Room not found."
+msgstr "Sala no encontrada."
+
+#: ../../Zotlabs/Lib/Chatroom.php:147
+msgid "Room is full"
+msgstr "La sala está llena."
+
+#: ../../Zotlabs/Lib/ThreadItem.php:85 ../../include/conversation.php:664
+msgid "Private Message"
+msgstr "Mensaje Privado"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:122 ../../include/conversation.php:656
+msgid "Select"
+msgstr "Seleccionar"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:126
+msgid "Save to Folder"
+msgstr "Guardar en carpeta"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:147
+msgid "I will attend"
+msgstr "Participaré"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:147
+msgid "I will not attend"
+msgstr "No participaré"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:147
+msgid "I might attend"
+msgstr "Quizá participe"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:157
+msgid "I agree"
+msgstr "Estoy de acuerdo"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:157
+msgid "I disagree"
+msgstr "No estoy de acuerdo"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:157
+msgid "I abstain"
+msgstr "Me abstengo"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:208
+msgid "Add Star"
+msgstr "Destacar añadiendo una estrella"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:209
+msgid "Remove Star"
+msgstr "Eliminar estrella"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:210
+msgid "Toggle Star Status"
+msgstr "Activar o desactivar el estado de entrada preferida"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:214
+msgid "starred"
+msgstr "preferidas"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:224 ../../include/conversation.php:671
+msgid "Message signature validated"
+msgstr "Firma de mensaje validada"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:225 ../../include/conversation.php:672
+msgid "Message signature incorrect"
+msgstr "Firma de mensaje incorrecta"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:233
+msgid "Add Tag"
+msgstr "Añadir etiqueta"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:251 ../../include/taxonomy.php:316
+msgid "like"
+msgstr "me gusta"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:252 ../../include/taxonomy.php:317
+msgid "dislike"
+msgstr "no me gusta"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:256
+msgid "Share This"
+msgstr "Compartir esto"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:256
+msgid "share"
+msgstr "compartir"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:265
+msgid "Delivery Report"
+msgstr "Informe de transmisión"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:283
 #, php-format
-msgid "Cannot locate DNS info for database server '%s'"
-msgstr "No se ha podido localizar información de DNS para el servidor de base de datos “%s”"
+msgid "%d comment"
+msgid_plural "%d comments"
+msgstr[0] "%d comentario"
+msgstr[1] "%d comentarios"
 
-#: ../../include/api.php:1338
-msgid "Public Timeline"
-msgstr "Cronología pública"
+#: ../../Zotlabs/Lib/ThreadItem.php:312 ../../Zotlabs/Lib/ThreadItem.php:313
+#, php-format
+msgid "View %s's profile - %s"
+msgstr "Ver el perfil de %s - %s"
 
-#: ../../include/notify.php:20
-msgid "created a new post"
-msgstr "ha creado una nueva entrada"
+#: ../../Zotlabs/Lib/ThreadItem.php:316
+msgid "to"
+msgstr "a"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:317
+msgid "via"
+msgstr "mediante"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:318
+msgid "Wall-to-Wall"
+msgstr "De página del perfil a página del perfil (de \"muro\" a \"muro\")"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:319
+msgid "via Wall-To-Wall:"
+msgstr "Mediante el procedimiento página del perfil a página del perfil (de \"muro\" a \"muro\")"
 
-#: ../../include/notify.php:21
+#: ../../Zotlabs/Lib/ThreadItem.php:331 ../../include/conversation.php:719
 #, php-format
-msgid "commented on %s's post"
-msgstr "ha comentado la entrada de %s"
+msgid "from %s"
+msgstr "desde %s"
 
-#: ../../include/oembed.php:324
-msgid "Embedded content"
-msgstr "Contenido incorporado"
+#: ../../Zotlabs/Lib/ThreadItem.php:334 ../../include/conversation.php:722
+#, php-format
+msgid "last edited: %s"
+msgstr "último cambio: %s"
 
-#: ../../include/oembed.php:333
-msgid "Embedding disabled"
-msgstr "Incrustación deshabilitada"
+#: ../../Zotlabs/Lib/ThreadItem.php:335 ../../include/conversation.php:723
+#, php-format
+msgid "Expires: %s"
+msgstr "Caduca: %s"
 
-#: ../../include/profile_selectors.php:6
-msgid "Currently Male"
-msgstr "Actualmente hombre"
+#: ../../Zotlabs/Lib/ThreadItem.php:359
+msgid "Save Bookmarks"
+msgstr "Guardar en Marcadores"
 
-#: ../../include/profile_selectors.php:6
-msgid "Currently Female"
-msgstr "Actualmente mujer"
+#: ../../Zotlabs/Lib/ThreadItem.php:360
+msgid "Add to Calendar"
+msgstr "Añadir al calendario"
 
-#: ../../include/profile_selectors.php:6
-msgid "Mostly Male"
-msgstr "Generalmente hombre"
+#: ../../Zotlabs/Lib/ThreadItem.php:369
+msgid "Mark all seen"
+msgstr "Marcar todo como visto"
 
-#: ../../include/profile_selectors.php:6
-msgid "Mostly Female"
-msgstr "Generalmente mujer"
+#: ../../Zotlabs/Lib/ThreadItem.php:410 ../../include/js_strings.php:7
+msgid "[+] show all"
+msgstr "[+] mostrar todo:"
 
-#: ../../include/profile_selectors.php:6
-msgid "Transgender"
-msgstr "Transgénero"
+#: ../../Zotlabs/Lib/ThreadItem.php:700 ../../include/conversation.php:1215
+msgid "Bold"
+msgstr "Negrita"
 
-#: ../../include/profile_selectors.php:6
-msgid "Intersex"
-msgstr "Intersexual"
+#: ../../Zotlabs/Lib/ThreadItem.php:701 ../../include/conversation.php:1216
+msgid "Italic"
+msgstr "Itálico "
 
-#: ../../include/profile_selectors.php:6
-msgid "Transsexual"
-msgstr "Transexual"
+#: ../../Zotlabs/Lib/ThreadItem.php:702 ../../include/conversation.php:1217
+msgid "Underline"
+msgstr "Subrayar"
 
-#: ../../include/profile_selectors.php:6
-msgid "Hermaphrodite"
-msgstr "Hermafrodita"
+#: ../../Zotlabs/Lib/ThreadItem.php:703 ../../include/conversation.php:1218
+msgid "Quote"
+msgstr "Citar"
 
-#: ../../include/profile_selectors.php:6
-msgid "Neuter"
-msgstr "Neutral"
+#: ../../Zotlabs/Lib/ThreadItem.php:704 ../../include/conversation.php:1219
+msgid "Code"
+msgstr "Código"
 
-#: ../../include/profile_selectors.php:6
-msgid "Non-specific"
-msgstr "No especificado"
+#: ../../Zotlabs/Lib/ThreadItem.php:705
+msgid "Image"
+msgstr "Imagen"
 
-#: ../../include/profile_selectors.php:6
-#: ../../include/profile_selectors.php:23
-#: ../../include/profile_selectors.php:61
-#: ../../include/profile_selectors.php:97 ../../include/permissions.php:881
-msgid "Other"
-msgstr "Otro"
+#: ../../Zotlabs/Lib/ThreadItem.php:706
+msgid "Insert Link"
+msgstr "Insertar enlace"
 
-#: ../../include/profile_selectors.php:6
-msgid "Undecided"
-msgstr "Indeciso/a"
+#: ../../Zotlabs/Lib/ThreadItem.php:707
+msgid "Video"
+msgstr "Vídeo"
 
-#: ../../include/profile_selectors.php:42
-#: ../../include/profile_selectors.php:61
-msgid "Males"
-msgstr "Hombres"
+#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1823
+msgid "$Projectname Notification"
+msgstr "Notificación de $Projectname"
 
-#: ../../include/profile_selectors.php:42
-#: ../../include/profile_selectors.php:61
-msgid "Females"
-msgstr "Mujeres"
+#: ../../Zotlabs/Lib/Enotify.php:61 ../../include/network.php:1824
+msgid "$projectname"
+msgstr "$projectname"
 
-#: ../../include/profile_selectors.php:42
-msgid "Gay"
-msgstr "Homosexual"
+#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1826
+msgid "Thank You,"
+msgstr "Gracias,"
 
-#: ../../include/profile_selectors.php:42
-msgid "Lesbian"
-msgstr "Lesbiana"
+#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1828
+#, php-format
+msgid "%s Administrator"
+msgstr "%s Administrador"
 
-#: ../../include/profile_selectors.php:42
-msgid "No Preference"
-msgstr "Sin preferencias"
+#: ../../Zotlabs/Lib/Enotify.php:100
+#, php-format
+msgid "%s <!item_type!>"
+msgstr "%s <!item_type!>"
 
-#: ../../include/profile_selectors.php:42
-msgid "Bisexual"
-msgstr "Bisexual"
+#: ../../Zotlabs/Lib/Enotify.php:104
+#, php-format
+msgid "[Hubzilla:Notify] New mail received at %s"
+msgstr "[Hubzilla:Aviso] Nuevo mensaje en %s"
 
-#: ../../include/profile_selectors.php:42
-msgid "Autosexual"
-msgstr "Autosexual"
+#: ../../Zotlabs/Lib/Enotify.php:106
+#, php-format
+msgid "%1$s, %2$s sent you a new private message at %3$s."
+msgstr "%1$s, %2$s le ha enviado un nuevo mensaje privado en %3$s."
 
-#: ../../include/profile_selectors.php:42
-msgid "Abstinent"
-msgstr "Casto/a"
+#: ../../Zotlabs/Lib/Enotify.php:107
+#, php-format
+msgid "%1$s sent you %2$s."
+msgstr "%1$s le ha enviado %2$s."
 
-#: ../../include/profile_selectors.php:42
-msgid "Virgin"
-msgstr "Virgen"
+#: ../../Zotlabs/Lib/Enotify.php:107
+msgid "a private message"
+msgstr "un mensaje privado"
 
-#: ../../include/profile_selectors.php:42
-msgid "Deviant"
-msgstr "Fuera de lo común"
+#: ../../Zotlabs/Lib/Enotify.php:108
+#, php-format
+msgid "Please visit %s to view and/or reply to your private messages."
+msgstr "Por favor visite %s para ver y/o responder a su mensaje privado."
 
-#: ../../include/profile_selectors.php:42
-msgid "Fetish"
-msgstr "Fetichista"
+#: ../../Zotlabs/Lib/Enotify.php:164
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
+msgstr "%1$s, %2$s ha comentado [zrl=%3$s]%4$s[/zrl]"
 
-#: ../../include/profile_selectors.php:42
-msgid "Oodles"
-msgstr "Orgías"
+#: ../../Zotlabs/Lib/Enotify.php:172
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
+msgstr "%1$s, %2$s ha comentado [zrl=%3$s]%5$s de %4$s[/zrl] "
 
-#: ../../include/profile_selectors.php:42
-msgid "Nonsexual"
-msgstr "Asexual"
+#: ../../Zotlabs/Lib/Enotify.php:181
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
+msgstr "%1$s, %2$s ha comentado [zrl=%3$s]%4$s creado por usted[/zrl]"
 
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Single"
-msgstr "Soltero/a"
+#: ../../Zotlabs/Lib/Enotify.php:192
+#, php-format
+msgid "[Hubzilla:Notify] Comment to conversation #%1$d by %2$s"
+msgstr "[Hubzilla:Aviso] Nuevo comentario de %2$s a la conversación #%1$d"
 
-#: ../../include/profile_selectors.php:80
-msgid "Lonely"
-msgstr "Solo/a"
+#: ../../Zotlabs/Lib/Enotify.php:193
+#, php-format
+msgid "%1$s, %2$s commented on an item/conversation you have been following."
+msgstr "%1$s, %2$s ha comentado un elemento/conversación que ha estado siguiendo."
 
-#: ../../include/profile_selectors.php:80
-msgid "Available"
-msgstr "Disponible"
+#: ../../Zotlabs/Lib/Enotify.php:196 ../../Zotlabs/Lib/Enotify.php:211
+#: ../../Zotlabs/Lib/Enotify.php:237 ../../Zotlabs/Lib/Enotify.php:255
+#: ../../Zotlabs/Lib/Enotify.php:269
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
+msgstr "Para ver o comentar la conversación, visite %s"
 
-#: ../../include/profile_selectors.php:80
-msgid "Unavailable"
-msgstr "No disponible"
+#: ../../Zotlabs/Lib/Enotify.php:202
+#, php-format
+msgid "[Hubzilla:Notify] %s posted to your profile wall"
+msgstr "[Hubzilla:Aviso] %s ha publicado una entrada en su página de inicio del perfil (\"muro\")"
 
-#: ../../include/profile_selectors.php:80
-msgid "Has crush"
-msgstr "Enamorado/a"
+#: ../../Zotlabs/Lib/Enotify.php:204
+#, php-format
+msgid "%1$s, %2$s posted to your profile wall at %3$s"
+msgstr "%1$s, %2$s ha publicado en su página del perfil en %3$s"
 
-#: ../../include/profile_selectors.php:80
-msgid "Infatuated"
-msgstr "Apasionado/a"
+#: ../../Zotlabs/Lib/Enotify.php:206
+#, php-format
+msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
+msgstr "%1$s, %2$s ha publicado en [zrl=%3$s]su página del perfil[/zrl]"
 
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Dating"
-msgstr "Saliendo con alguien"
+#: ../../Zotlabs/Lib/Enotify.php:230
+#, php-format
+msgid "[Hubzilla:Notify] %s tagged you"
+msgstr "[Hubzilla:Aviso] %s le ha etiquetado"
 
-#: ../../include/profile_selectors.php:80
-msgid "Unfaithful"
-msgstr "Infiel"
+#: ../../Zotlabs/Lib/Enotify.php:231
+#, php-format
+msgid "%1$s, %2$s tagged you at %3$s"
+msgstr "%1$s, %2$s le ha etiquetado en %3$s"
 
-#: ../../include/profile_selectors.php:80
-msgid "Sex Addict"
-msgstr "Con adicción al sexo"
+#: ../../Zotlabs/Lib/Enotify.php:232
+#, php-format
+msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
+msgstr "%1$s, %2$s [zrl=%3$s]le etiquetó[/zrl]."
 
-#: ../../include/profile_selectors.php:80
-msgid "Friends/Benefits"
-msgstr "Amigos con algo extra"
+#: ../../Zotlabs/Lib/Enotify.php:244
+#, php-format
+msgid "[Hubzilla:Notify] %1$s poked you"
+msgstr "[Hubzilla:Aviso] %1$s le ha dado un toque"
 
-#: ../../include/profile_selectors.php:80
-msgid "Casual"
-msgstr "Casual"
+#: ../../Zotlabs/Lib/Enotify.php:245
+#, php-format
+msgid "%1$s, %2$s poked you at %3$s"
+msgstr "%1$s, %2$s le ha dado un toque en %3$s"
 
-#: ../../include/profile_selectors.php:80
-msgid "Engaged"
-msgstr "Prometido/a"
+#: ../../Zotlabs/Lib/Enotify.php:246
+#, php-format
+msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
+msgstr "%1$s, %2$s [zrl=%2$s]le ha dado un toque[/zrl]."
 
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Married"
-msgstr "Casado/a"
+#: ../../Zotlabs/Lib/Enotify.php:262
+#, php-format
+msgid "[Hubzilla:Notify] %s tagged your post"
+msgstr "[Hubzilla:Aviso] %s ha etiquetado su publicación"
 
-#: ../../include/profile_selectors.php:80
-msgid "Imaginarily married"
-msgstr "Casado/a en sueños"
+#: ../../Zotlabs/Lib/Enotify.php:263
+#, php-format
+msgid "%1$s, %2$s tagged your post at %3$s"
+msgstr "%1$s, %2$s ha etiquetado su publicación en %3$s"
 
-#: ../../include/profile_selectors.php:80
-msgid "Partners"
-msgstr "Pareja"
+#: ../../Zotlabs/Lib/Enotify.php:264
+#, php-format
+msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
+msgstr "%1$s, %2$s ha etiquetado [zrl=%3$s]su publicación[/zrl]"
 
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Cohabiting"
-msgstr "Cohabitando"
+#: ../../Zotlabs/Lib/Enotify.php:276
+msgid "[Hubzilla:Notify] Introduction received"
+msgstr "[Hubzilla:Aviso] Ha recibido una solicitud de conexión"
 
-#: ../../include/profile_selectors.php:80
-msgid "Common law"
-msgstr "Matrimonio tradicional"
+#: ../../Zotlabs/Lib/Enotify.php:277
+#, php-format
+msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
+msgstr "%1$s, ha recibido una nueva solicitud de conexión de '%2$s' en  %3$s"
 
-#: ../../include/profile_selectors.php:80
-msgid "Happy"
-msgstr "Felíz"
+#: ../../Zotlabs/Lib/Enotify.php:278
+#, php-format
+msgid ""
+"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
+msgstr "%1$s, ha recibido [zrl=%2$s]una nueva solicitud de conexión[/zrl] de %3$s."
 
-#: ../../include/profile_selectors.php:80
-msgid "Not looking"
-msgstr "No estoy buscando"
+#: ../../Zotlabs/Lib/Enotify.php:282 ../../Zotlabs/Lib/Enotify.php:301
+#, php-format
+msgid "You may visit their profile at %s"
+msgstr "Puede visitar su perfil en %s"
 
-#: ../../include/profile_selectors.php:80
-msgid "Swinger"
-msgstr "Libertino"
+#: ../../Zotlabs/Lib/Enotify.php:284
+#, php-format
+msgid "Please visit %s to approve or reject the connection request."
+msgstr "Por favor, visite %s para permitir o rechazar la solicitad de conexión."
 
-#: ../../include/profile_selectors.php:80
-msgid "Betrayed"
-msgstr "Engañado/a"
+#: ../../Zotlabs/Lib/Enotify.php:291
+msgid "[Hubzilla:Notify] Friend suggestion received"
+msgstr "[Hubzilla:Aviso] Ha recibido una sugerencia de amistad"
 
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Separated"
-msgstr "Separado/a"
+#: ../../Zotlabs/Lib/Enotify.php:292
+#, php-format
+msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
+msgstr "%1$s, ha recibido una sugerencia de conexión de '%2$s' en %3$s"
 
-#: ../../include/profile_selectors.php:80
-msgid "Unstable"
-msgstr "Inestable"
+#: ../../Zotlabs/Lib/Enotify.php:293
+#, php-format
+msgid ""
+"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from "
+"%4$s."
+msgstr "%1$s, ha recibido [zrl=%2$s]una sugerencia de conexión[/zrl] para %3$s de %4$s."
 
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Divorced"
-msgstr "Divorciado/a"
+#: ../../Zotlabs/Lib/Enotify.php:299
+msgid "Name:"
+msgstr "Nombre:"
 
-#: ../../include/profile_selectors.php:80
-msgid "Imaginarily divorced"
-msgstr "Divorciado/a en sueños"
+#: ../../Zotlabs/Lib/Enotify.php:300
+msgid "Photo:"
+msgstr "Foto:"
 
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Widowed"
-msgstr "Viudo/a"
+#: ../../Zotlabs/Lib/Enotify.php:303
+#, php-format
+msgid "Please visit %s to approve or reject the suggestion."
+msgstr "Por favor, visite %s para aprobar o rechazar la sugerencia."
 
-#: ../../include/profile_selectors.php:80
-msgid "Uncertain"
-msgstr "Indeterminado"
+#: ../../Zotlabs/Lib/Enotify.php:518
+msgid "[Hubzilla:Notify]"
+msgstr "[Hubzilla:Aviso]"
 
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "It's complicated"
-msgstr "Es complicado"
+#: ../../Zotlabs/Lib/Enotify.php:667
+msgid "created a new post"
+msgstr "ha creado una nueva entrada"
 
-#: ../../include/profile_selectors.php:80
-msgid "Don't care"
-msgstr "No me importa"
+#: ../../Zotlabs/Lib/Enotify.php:668
+#, php-format
+msgid "commented on %s's post"
+msgstr "ha comentado la entrada de %s"
 
-#: ../../include/profile_selectors.php:80
-msgid "Ask me"
-msgstr "Pregúnteme"
+#: ../../include/Import/import_diaspora.php:16
+msgid "No username found in import file."
+msgstr "No se ha encontrado el nombre de usuario en el fichero importado."
+
+#: ../../include/Import/import_diaspora.php:41 ../../include/import.php:50
+msgid "Unable to create a unique channel address. Import failed."
+msgstr "No se ha podido crear una dirección de canal única. Ha fallado la importación."
+
+#: ../../include/dba/dba_driver.php:171
+#, php-format
+msgid "Cannot locate DNS info for database server '%s'"
+msgstr "No se ha podido localizar información de DNS para el servidor de base de datos “%s”"
+
+#: ../../include/network.php:657
+msgid "view full size"
+msgstr "Ver en el tamaño original"
+
+#: ../../include/network.php:1871 ../../include/account.php:317
+#: ../../include/account.php:344 ../../include/account.php:404
+msgid "Administrator"
+msgstr "Administrador"
+
+#: ../../include/network.php:1885
+msgid "No Subject"
+msgstr "Sin asunto"
+
+#: ../../include/network.php:2146 ../../include/network.php:2147
+msgid "Friendica"
+msgstr "Friendica"
+
+#: ../../include/network.php:2148
+msgid "OStatus"
+msgstr "OStatus"
+
+#: ../../include/network.php:2149
+msgid "GNU-Social"
+msgstr "GNU Social"
+
+#: ../../include/network.php:2150
+msgid "RSS/Atom"
+msgstr "RSS/Atom"
+
+#: ../../include/network.php:2152
+msgid "Diaspora"
+msgstr "Diaspora"
+
+#: ../../include/network.php:2153
+msgid "Facebook"
+msgstr "Facebook"
+
+#: ../../include/network.php:2154
+msgid "Zot"
+msgstr "Zot"
+
+#: ../../include/network.php:2155
+msgid "LinkedIn"
+msgstr "LinkedIn"
+
+#: ../../include/network.php:2156
+msgid "XMPP/IM"
+msgstr "XMPP/IM"
+
+#: ../../include/network.php:2157
+msgid "MySpace"
+msgstr "MySpace"
+
+#: ../../include/photos.php:110
+#, php-format
+msgid "Image exceeds website size limit of %lu bytes"
+msgstr "La imagen excede el límite de %lu bytes del sitio"
+
+#: ../../include/photos.php:117
+msgid "Image file is empty."
+msgstr "El fichero de imagen está vacío. "
+
+#: ../../include/photos.php:255
+msgid "Photo storage failed."
+msgstr "La foto no ha podido ser guardada."
 
-#: ../../include/Contact.php:118
+#: ../../include/photos.php:295
+msgid "a new photo"
+msgstr "una nueva foto"
+
+#: ../../include/photos.php:299
+#, php-format
+msgctxt "photo_upload"
+msgid "%1$s posted %2$s to %3$s"
+msgstr "%1$s ha publicado %2$s en %3$s"
+
+#: ../../include/photos.php:504 ../../include/conversation.php:1635
+msgid "Photo Albums"
+msgstr "Álbumes de fotos"
+
+#: ../../include/photos.php:508
+msgid "Upload New Photos"
+msgstr "Subir nuevas fotos"
+
+#: ../../include/connections.php:95
 msgid "New window"
 msgstr "Nueva ventana"
 
-#: ../../include/Contact.php:119
+#: ../../include/connections.php:96
 msgid "Open the selected location in a different window or browser tab"
 msgstr "Abrir la dirección seleccionada en una ventana o pestaña aparte"
 
-#: ../../include/Contact.php:237
+#: ../../include/connections.php:214
 #, php-format
 msgid "User '%s' deleted"
 msgstr "El usuario '%s' ha sido eliminado"
 
-#: ../../include/zot.php:680
-msgid "Invalid data packet"
-msgstr "Paquete de datos no válido"
-
-#: ../../include/zot.php:696
-msgid "Unable to verify channel signature"
-msgstr "No ha sido posible de verificar la firma del canal"
-
-#: ../../include/zot.php:2342
-#, php-format
-msgid "Unable to verify site signature for %s"
-msgstr "No ha sido posible de verificar la firma del sitio para %s"
+#: ../../include/oembed.php:324
+msgid "Embedded content"
+msgstr "Contenido incorporado"
 
-#: ../../include/zot.php:3680
-msgid "invalid target signature"
-msgstr "La firma recibida no es válida"
+#: ../../include/oembed.php:333
+msgid "Embedding disabled"
+msgstr "Incrustación deshabilitada"
 
-#: ../../include/contact_widgets.php:14
+#: ../../include/contact_widgets.php:11
 #, php-format
 msgid "%d invitation available"
 msgid_plural "%d invitations available"
 msgstr[0] "%d invitación pendiente"
 msgstr[1] "%d invitaciones disponibles"
 
-#: ../../include/contact_widgets.php:22
+#: ../../include/contact_widgets.php:19
 msgid "Find Channels"
 msgstr "Encontrar canales"
 
-#: ../../include/contact_widgets.php:23
+#: ../../include/contact_widgets.php:20
 msgid "Enter name or interest"
 msgstr "Introducir nombre o interés"
 
-#: ../../include/contact_widgets.php:24
+#: ../../include/contact_widgets.php:21
 msgid "Connect/Follow"
 msgstr "Conectar/Seguir"
 
-#: ../../include/contact_widgets.php:25
+#: ../../include/contact_widgets.php:22
 msgid "Examples: Robert Morgenstein, Fishing"
 msgstr "Ejemplos: José Fernández, Pesca"
 
-#: ../../include/contact_widgets.php:29
+#: ../../include/contact_widgets.php:26
 msgid "Random Profile"
 msgstr "Perfil aleatorio"
 
-#: ../../include/contact_widgets.php:30
+#: ../../include/contact_widgets.php:27
 msgid "Invite Friends"
 msgstr "Invitar a amigos"
 
-#: ../../include/contact_widgets.php:32
+#: ../../include/contact_widgets.php:29
 msgid "Advanced example: name=fred and country=iceland"
 msgstr "Ejemplo avanzado: nombre=juan y país=españa"
 
-#: ../../include/contact_widgets.php:57 ../../include/widgets.php:310
+#: ../../include/contact_widgets.php:53 ../../include/widgets.php:310
 #: ../../include/features.php:97
 msgid "Saved Folders"
 msgstr "Carpetas guardadas"
 
-#: ../../include/contact_widgets.php:60 ../../include/contact_widgets.php:100
+#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94
 #: ../../include/widgets.php:313 ../../include/widgets.php:432
 msgid "Everything"
 msgstr "Todo"
 
-#: ../../include/contact_widgets.php:97 ../../include/widgets.php:46
+#: ../../include/contact_widgets.php:91 ../../include/widgets.php:46
 #: ../../include/widgets.php:429 ../../include/taxonomy.php:188
 #: ../../include/taxonomy.php:270
 msgid "Categories"
 msgstr "Categorías"
 
-#: ../../include/contact_widgets.php:130
+#: ../../include/contact_widgets.php:122
 #, php-format
 msgid "%d connection in common"
 msgid_plural "%d connections in common"
 msgstr[0] "%d conexión en común"
 msgstr[1] "%d conexiones en común"
 
-#: ../../include/contact_widgets.php:135
+#: ../../include/contact_widgets.php:127
 msgid "show more"
 msgstr "mostrar más"
 
-#: ../../include/event.php:22 ../../include/text.php:1466
-#: ../../include/bb2diaspora.php:487
+#: ../../include/conversation.php:204
+#, php-format
+msgid "%1$s is now connected with %2$s"
+msgstr "%1$s ahora está conectado/a con %2$s"
+
+#: ../../include/conversation.php:239
+#, php-format
+msgid "%1$s poked %2$s"
+msgstr "%1$s ha dado un toque a %2$s"
+
+#: ../../include/conversation.php:243 ../../include/text.php:1033
+#: ../../include/text.php:1038
+msgid "poked"
+msgstr "ha dado un toque a"
+
+#: ../../include/conversation.php:691
+#, php-format
+msgid "View %s's profile @ %s"
+msgstr "Ver el perfil @ %s de %s"
+
+#: ../../include/conversation.php:710
+msgid "Categories:"
+msgstr "Categorías:"
+
+#: ../../include/conversation.php:711
+msgid "Filed under:"
+msgstr "Archivado bajo:"
+
+#: ../../include/conversation.php:738
+msgid "View in context"
+msgstr "Mostrar en su contexto"
+
+#: ../../include/conversation.php:847
+msgid "remove"
+msgstr "eliminar"
+
+#: ../../include/conversation.php:851 ../../include/nav.php:247
+msgid "Loading..."
+msgstr "Cargando..."
+
+#: ../../include/conversation.php:852
+msgid "Delete Selected Items"
+msgstr "Eliminar elementos seleccionados"
+
+#: ../../include/conversation.php:948
+msgid "View Source"
+msgstr "Ver el código fuente de la entrada"
+
+#: ../../include/conversation.php:949
+msgid "Follow Thread"
+msgstr "Seguir este hilo"
+
+#: ../../include/conversation.php:950
+msgid "Unfollow Thread"
+msgstr "Dejar de seguir este hilo"
+
+#: ../../include/conversation.php:955
+msgid "Activity/Posts"
+msgstr "Actividad y publicaciones"
+
+#: ../../include/conversation.php:957
+msgid "Edit Connection"
+msgstr "Editar conexión"
+
+#: ../../include/conversation.php:958
+msgid "Message"
+msgstr "Mensaje"
+
+#: ../../include/conversation.php:1075
+#, php-format
+msgid "%s likes this."
+msgstr "A %s le gusta esto."
+
+#: ../../include/conversation.php:1075
+#, php-format
+msgid "%s doesn't like this."
+msgstr "A %s no le gusta esto."
+
+#: ../../include/conversation.php:1079
+#, 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."
+
+#: ../../include/conversation.php:1081
+#, 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."
+
+#: ../../include/conversation.php:1087
+msgid "and"
+msgstr "y"
+
+#: ../../include/conversation.php:1090
+#, php-format
+msgid ", and %d other people"
+msgid_plural ", and %d other people"
+msgstr[0] ", y %d persona más"
+msgstr[1] ", y %d personas más"
+
+#: ../../include/conversation.php:1091
+#, php-format
+msgid "%s like this."
+msgstr "A %s le gusta esto."
+
+#: ../../include/conversation.php:1091
+#, php-format
+msgid "%s don't like this."
+msgstr "A %s no le gusta esto."
+
+#: ../../include/conversation.php:1130
+msgid "Set your location"
+msgstr "Establecer su ubicación"
+
+#: ../../include/conversation.php:1131
+msgid "Clear browser location"
+msgstr "Eliminar los datos de localización geográfica del navegador"
+
+#: ../../include/conversation.php:1177
+msgid "Tag term:"
+msgstr "Término de la etiqueta:"
+
+#: ../../include/conversation.php:1178
+msgid "Where are you right now?"
+msgstr "¿Donde está ahora?"
+
+#: ../../include/conversation.php:1210
+msgid "Page link name"
+msgstr "Nombre del enlace de la página"
+
+#: ../../include/conversation.php:1213
+msgid "Post as"
+msgstr "Publicar como"
+
+#: ../../include/conversation.php:1223
+msgid "Toggle voting"
+msgstr "Cambiar votación"
+
+#: ../../include/conversation.php:1231
+msgid "Categories (optional, comma-separated list)"
+msgstr "Categorías (opcional, lista separada por comas)"
+
+#: ../../include/conversation.php:1254
+msgid "Set publish date"
+msgstr "Establecer la fecha de publicación"
+
+#: ../../include/conversation.php:1258
+msgid "OK"
+msgstr "OK"
+
+#: ../../include/conversation.php:1503
+msgid "Discover"
+msgstr "Descubrir"
+
+#: ../../include/conversation.php:1506
+msgid "Imported public streams"
+msgstr "Contenidos públicos importados"
+
+#: ../../include/conversation.php:1511
+msgid "Commented Order"
+msgstr "Comentarios recientes"
+
+#: ../../include/conversation.php:1514
+msgid "Sort by Comment Date"
+msgstr "Ordenar por fecha de comentario"
+
+#: ../../include/conversation.php:1518
+msgid "Posted Order"
+msgstr "Publicaciones recientes"
+
+#: ../../include/conversation.php:1521
+msgid "Sort by Post Date"
+msgstr "Ordenar por fecha de publicación"
+
+#: ../../include/conversation.php:1529
+msgid "Posts that mention or involve you"
+msgstr "Publicaciones que le mencionan o involucran"
+
+#: ../../include/conversation.php:1538
+msgid "Activity Stream - by date"
+msgstr "Contenido - por fecha"
+
+#: ../../include/conversation.php:1544
+msgid "Starred"
+msgstr "Preferidas"
+
+#: ../../include/conversation.php:1547
+msgid "Favourite Posts"
+msgstr "Publicaciones favoritas"
+
+#: ../../include/conversation.php:1554
+msgid "Spam"
+msgstr "Correo basura"
+
+#: ../../include/conversation.php:1557
+msgid "Posts flagged as SPAM"
+msgstr "Publicaciones marcadas como basura"
+
+#: ../../include/conversation.php:1614
+msgid "Status Messages and Posts"
+msgstr "Mensajes de estado y publicaciones"
+
+#: ../../include/conversation.php:1623
+msgid "About"
+msgstr "Mi perfil"
+
+#: ../../include/conversation.php:1626
+msgid "Profile Details"
+msgstr "Detalles del perfil"
+
+#: ../../include/conversation.php:1642
+msgid "Files and Storage"
+msgstr "Ficheros y repositorio"
+
+#: ../../include/conversation.php:1662 ../../include/conversation.php:1665
+#: ../../include/widgets.php:840
+msgid "Chatrooms"
+msgstr "Salas de chat"
+
+#: ../../include/conversation.php:1675 ../../include/nav.php:102
+msgid "Bookmarks"
+msgstr "Marcadores"
+
+#: ../../include/conversation.php:1678
+msgid "Saved Bookmarks"
+msgstr "Marcadores guardados"
+
+#: ../../include/conversation.php:1688
+msgid "Manage Webpages"
+msgstr "Administrar páginas web"
+
+#: ../../include/conversation.php:1747
+msgctxt "noun"
+msgid "Attending"
+msgid_plural "Attending"
+msgstr[0] "Participaré"
+msgstr[1] "Participaré"
+
+#: ../../include/conversation.php:1750
+msgctxt "noun"
+msgid "Not Attending"
+msgid_plural "Not Attending"
+msgstr[0] "No participaré"
+msgstr[1] "No participaré"
+
+#: ../../include/conversation.php:1753
+msgctxt "noun"
+msgid "Undecided"
+msgid_plural "Undecided"
+msgstr[0] "Indeciso/a"
+msgstr[1] "Indecisos/as"
+
+#: ../../include/conversation.php:1756
+msgctxt "noun"
+msgid "Agree"
+msgid_plural "Agrees"
+msgstr[0] "De acuerdo"
+msgstr[1] "De acuerdo"
+
+#: ../../include/conversation.php:1759
+msgctxt "noun"
+msgid "Disagree"
+msgid_plural "Disagrees"
+msgstr[0] "En desacuerdo"
+msgstr[1] "En desacuerdo"
+
+#: ../../include/conversation.php:1762
+msgctxt "noun"
+msgid "Abstain"
+msgid_plural "Abstains"
+msgstr[0] "se abstiene"
+msgstr[1] "Se abstienen"
+
+#: ../../include/event.php:22 ../../include/event.php:69
+#: ../../include/bb2diaspora.php:485
 msgid "l F d, Y \\@ g:i A"
 msgstr "l d de F, Y \\@ G:i"
 
-#: ../../include/event.php:30 ../../include/text.php:1470
-#: ../../include/bb2diaspora.php:493
+#: ../../include/event.php:30 ../../include/event.php:73
+#: ../../include/bb2diaspora.php:491
 msgid "Starts:"
 msgstr "Comienza:"
 
-#: ../../include/event.php:40 ../../include/text.php:1474
-#: ../../include/bb2diaspora.php:501
+#: ../../include/event.php:40 ../../include/event.php:77
+#: ../../include/bb2diaspora.php:499
 msgid "Finishes:"
 msgstr "Finaliza:"
 
-#: ../../include/event.php:769
+#: ../../include/event.php:812
 msgid "This event has been added to your calendar."
 msgstr "Este evento ha sido añadido a su calendario."
 
-#: ../../include/event.php:968
+#: ../../include/event.php:1012
 msgid "Not specified"
 msgstr "Sin especificar"
 
-#: ../../include/event.php:969
+#: ../../include/event.php:1013
 msgid "Needs Action"
 msgstr "Necesita de una intervención"
 
-#: ../../include/event.php:970
+#: ../../include/event.php:1014
 msgid "Completed"
 msgstr "Completado/a"
 
-#: ../../include/event.php:971
+#: ../../include/event.php:1015
 msgid "In Process"
 msgstr "En proceso"
 
-#: ../../include/event.php:972
+#: ../../include/event.php:1016
 msgid "Cancelled"
 msgstr "Cancelado/a"
 
-#: ../../include/widgets.php:103
-msgid "System"
-msgstr "Sistema"
+#: ../../include/message.php:20
+msgid "No recipient provided."
+msgstr "No se ha especificado ningún destinatario."
 
-#: ../../include/widgets.php:106
-msgid "New App"
-msgstr "Nueva aplicación (app)"
+#: ../../include/message.php:25
+msgid "[no subject]"
+msgstr "[sin asunto]"
 
-#: ../../include/widgets.php:154
-msgid "Suggestions"
-msgstr "Sugerencias"
+#: ../../include/message.php:45
+msgid "Unable to determine sender."
+msgstr "No ha sido posible determinar el remitente. "
 
-#: ../../include/widgets.php:155
-msgid "See more..."
-msgstr "Ver más..."
+#: ../../include/message.php:222
+msgid "Stored post could not be verified."
+msgstr "No se han podido verificar las publicaciones guardadas."
 
-#: ../../include/widgets.php:175
-#, php-format
-msgid "You have %1$.0f of %2$.0f allowed connections."
-msgstr "Tiene %1$.0f de %2$.0f conexiones permitidas."
+#: ../../include/selectors.php:30
+msgid "Frequently"
+msgstr "Frecuentemente"
 
-#: ../../include/widgets.php:181
-msgid "Add New Connection"
-msgstr "Añadir nueva conexión"
+#: ../../include/selectors.php:31
+msgid "Hourly"
+msgstr "Cada hora"
 
-#: ../../include/widgets.php:182
-msgid "Enter channel address"
-msgstr "Dirección del canal"
+#: ../../include/selectors.php:32
+msgid "Twice daily"
+msgstr "Dos veces al día"
 
-#: ../../include/widgets.php:183
-msgid "Examples: bob@example.com, https://example.com/barbara"
-msgstr "Ejemplos: manuel@ejemplo.com, https://ejemplo.com/carmen"
+#: ../../include/selectors.php:33
+msgid "Daily"
+msgstr "Diariamente"
 
-#: ../../include/widgets.php:199
-msgid "Notes"
-msgstr "Notas"
+#: ../../include/selectors.php:34
+msgid "Weekly"
+msgstr "Semanalmente"
 
-#: ../../include/widgets.php:273
-msgid "Remove term"
-msgstr "Eliminar término"
+#: ../../include/selectors.php:35
+msgid "Monthly"
+msgstr "Mensualmente"
 
-#: ../../include/widgets.php:281 ../../include/features.php:84
-msgid "Saved Searches"
-msgstr "Búsquedas guardadas"
+#: ../../include/selectors.php:49
+msgid "Currently Male"
+msgstr "Actualmente hombre"
 
-#: ../../include/widgets.php:282 ../../include/group.php:316
-msgid "add"
-msgstr "añadir"
+#: ../../include/selectors.php:49
+msgid "Currently Female"
+msgstr "Actualmente mujer"
 
-#: ../../include/widgets.php:354
-msgid "Archives"
-msgstr "Hemeroteca"
+#: ../../include/selectors.php:49
+msgid "Mostly Male"
+msgstr "Generalmente hombre"
 
-#: ../../include/widgets.php:516
-msgid "Refresh"
-msgstr "Recargar"
+#: ../../include/selectors.php:49
+msgid "Mostly Female"
+msgstr "Generalmente mujer"
 
-#: ../../include/widgets.php:556
-msgid "Account settings"
-msgstr "Configuración de la cuenta"
+#: ../../include/selectors.php:49
+msgid "Transgender"
+msgstr "Transgénero"
 
-#: ../../include/widgets.php:562
-msgid "Channel settings"
-msgstr "Configuración del canal"
+#: ../../include/selectors.php:49
+msgid "Intersex"
+msgstr "Intersexual"
 
-#: ../../include/widgets.php:571
-msgid "Additional features"
-msgstr "Funcionalidades"
+#: ../../include/selectors.php:49
+msgid "Transsexual"
+msgstr "Transexual"
 
-#: ../../include/widgets.php:578
-msgid "Feature/Addon settings"
-msgstr "Complementos"
+#: ../../include/selectors.php:49
+msgid "Hermaphrodite"
+msgstr "Hermafrodita"
 
-#: ../../include/widgets.php:584
-msgid "Display settings"
-msgstr "Ajustes de visualización"
+#: ../../include/selectors.php:49
+msgid "Neuter"
+msgstr "Neutral"
 
-#: ../../include/widgets.php:591
-msgid "Manage locations"
-msgstr "Gestión de ubicaciones (clones) del canal"
+#: ../../include/selectors.php:49
+msgid "Non-specific"
+msgstr "No especificado"
 
-#: ../../include/widgets.php:600
-msgid "Export channel"
-msgstr "Exportar canal"
+#: ../../include/selectors.php:49 ../../include/selectors.php:66
+#: ../../include/selectors.php:104 ../../include/selectors.php:140
+#: ../../include/permissions.php:881
+msgid "Other"
+msgstr "Otro"
 
-#: ../../include/widgets.php:607
-msgid "Connected apps"
-msgstr "Aplicaciones (apps) conectadas"
+#: ../../include/selectors.php:49
+msgid "Undecided"
+msgstr "Indeciso/a"
 
-#: ../../include/widgets.php:622
-msgid "Premium Channel Settings"
-msgstr "Configuración del canal premium"
+#: ../../include/selectors.php:85 ../../include/selectors.php:104
+msgid "Males"
+msgstr "Hombres"
 
-#: ../../include/widgets.php:651
-msgid "Private Mail Menu"
-msgstr "Menú de correo privado"
+#: ../../include/selectors.php:85 ../../include/selectors.php:104
+msgid "Females"
+msgstr "Mujeres"
 
-#: ../../include/widgets.php:653
-msgid "Combined View"
-msgstr "Vista combinada"
+#: ../../include/selectors.php:85
+msgid "Gay"
+msgstr "Homosexual"
 
-#: ../../include/widgets.php:658 ../../include/nav.php:196
-msgid "Inbox"
-msgstr "Bandeja de entrada"
+#: ../../include/selectors.php:85
+msgid "Lesbian"
+msgstr "Lesbiana"
 
-#: ../../include/widgets.php:663 ../../include/nav.php:197
-msgid "Outbox"
-msgstr "Bandeja de salida"
+#: ../../include/selectors.php:85
+msgid "No Preference"
+msgstr "Sin preferencias"
 
-#: ../../include/widgets.php:668 ../../include/nav.php:198
-msgid "New Message"
-msgstr "Nuevo mensaje"
+#: ../../include/selectors.php:85
+msgid "Bisexual"
+msgstr "Bisexual"
 
-#: ../../include/widgets.php:685 ../../include/widgets.php:697
-msgid "Conversations"
-msgstr "Conversaciones"
+#: ../../include/selectors.php:85
+msgid "Autosexual"
+msgstr "Autosexual"
 
-#: ../../include/widgets.php:689
-msgid "Received Messages"
-msgstr "Mensajes recibidos"
+#: ../../include/selectors.php:85
+msgid "Abstinent"
+msgstr "Casto/a"
 
-#: ../../include/widgets.php:693
-msgid "Sent Messages"
-msgstr "Enviar mensajes"
+#: ../../include/selectors.php:85
+msgid "Virgin"
+msgstr "Virgen"
 
-#: ../../include/widgets.php:707
-msgid "No messages."
-msgstr "Sin mensajes."
+#: ../../include/selectors.php:85
+msgid "Deviant"
+msgstr "Fuera de lo común"
 
-#: ../../include/widgets.php:725
-msgid "Delete conversation"
-msgstr "Eliminar conversación"
+#: ../../include/selectors.php:85
+msgid "Fetish"
+msgstr "Fetichista"
 
-#: ../../include/widgets.php:751
-msgid "Events Menu"
-msgstr "Menú de eventos"
+#: ../../include/selectors.php:85
+msgid "Oodles"
+msgstr "Orgías"
 
-#: ../../include/widgets.php:752
-msgid "Day View"
-msgstr "Eventos del día"
+#: ../../include/selectors.php:85
+msgid "Nonsexual"
+msgstr "Asexual"
 
-#: ../../include/widgets.php:753
-msgid "Week View"
-msgstr "Eventos de la semana"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Single"
+msgstr "Soltero/a"
 
-#: ../../include/widgets.php:754
-msgid "Month View"
-msgstr "Eventos del mes"
+#: ../../include/selectors.php:123
+msgid "Lonely"
+msgstr "Solo/a"
 
-#: ../../include/widgets.php:766
-msgid "Events Tools"
-msgstr "Gestión de eventos"
+#: ../../include/selectors.php:123
+msgid "Available"
+msgstr "Disponible"
 
-#: ../../include/widgets.php:767
-msgid "Export Calendar"
-msgstr "Exportar el calendario"
+#: ../../include/selectors.php:123
+msgid "Unavailable"
+msgstr "No disponible"
 
-#: ../../include/widgets.php:768
-msgid "Import Calendar"
-msgstr "Importar un calendario"
+#: ../../include/selectors.php:123
+msgid "Has crush"
+msgstr "Enamorado/a"
 
-#: ../../include/widgets.php:843 ../../include/conversation.php:1669
-#: ../../include/conversation.php:1672
-msgid "Chatrooms"
-msgstr "Salas de chat"
+#: ../../include/selectors.php:123
+msgid "Infatuated"
+msgstr "Apasionado/a"
 
-#: ../../include/widgets.php:847
-msgid "Overview"
-msgstr "Resumen"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Dating"
+msgstr "Saliendo con alguien"
 
-#: ../../include/widgets.php:854
-msgid "Chat Members"
-msgstr "Miembros del chat"
+#: ../../include/selectors.php:123
+msgid "Unfaithful"
+msgstr "Infiel"
 
-#: ../../include/widgets.php:877
-msgid "Bookmarked Chatrooms"
-msgstr "Salas de chat preferidas"
+#: ../../include/selectors.php:123
+msgid "Sex Addict"
+msgstr "Con adicción al sexo"
 
-#: ../../include/widgets.php:900
-msgid "Suggested Chatrooms"
-msgstr "Salas de chat sugeridas"
+#: ../../include/selectors.php:123
+msgid "Friends/Benefits"
+msgstr "Amigos con algo extra"
 
-#: ../../include/widgets.php:1045 ../../include/widgets.php:1157
-msgid "photo/image"
-msgstr "foto/imagen"
+#: ../../include/selectors.php:123
+msgid "Casual"
+msgstr "Casual"
 
-#: ../../include/widgets.php:1100
-msgid "Click to show more"
-msgstr "Hacer clic para ver más"
+#: ../../include/selectors.php:123
+msgid "Engaged"
+msgstr "Prometido/a"
 
-#: ../../include/widgets.php:1251
-msgid "Rating Tools"
-msgstr "Valoraciones"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Married"
+msgstr "Casado/a"
 
-#: ../../include/widgets.php:1255 ../../include/widgets.php:1257
-msgid "Rate Me"
-msgstr "Valorar este canal"
+#: ../../include/selectors.php:123
+msgid "Imaginarily married"
+msgstr "Casado/a en sueños"
 
-#: ../../include/widgets.php:1260
-msgid "View Ratings"
-msgstr "Mostrar las valoraciones"
+#: ../../include/selectors.php:123
+msgid "Partners"
+msgstr "Pareja"
 
-#: ../../include/widgets.php:1317
-msgid "Forums"
-msgstr "Foros"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Cohabiting"
+msgstr "Cohabitando"
 
-#: ../../include/widgets.php:1346
-msgid "Tasks"
-msgstr "Tareas"
+#: ../../include/selectors.php:123
+msgid "Common law"
+msgstr "Matrimonio tradicional"
 
-#: ../../include/widgets.php:1355
-msgid "Documentation"
-msgstr "Documentación"
+#: ../../include/selectors.php:123
+msgid "Happy"
+msgstr "Felíz"
 
-#: ../../include/widgets.php:1357
-msgid "Project/Site Information"
-msgstr "Información sobre el proyecto o sitio"
+#: ../../include/selectors.php:123
+msgid "Not looking"
+msgstr "No estoy buscando"
 
-#: ../../include/widgets.php:1358
-msgid "For Members"
-msgstr "Para los miembros"
+#: ../../include/selectors.php:123
+msgid "Swinger"
+msgstr "Libertino"
 
-#: ../../include/widgets.php:1359
-msgid "For Administrators"
-msgstr "Para los administradores"
+#: ../../include/selectors.php:123
+msgid "Betrayed"
+msgstr "Engañado/a"
 
-#: ../../include/widgets.php:1360
-msgid "For Developers"
-msgstr "Para los desarrolladores"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Separated"
+msgstr "Separado/a"
 
-#: ../../include/widgets.php:1384
-msgid "Accounts"
-msgstr "Cuentas"
+#: ../../include/selectors.php:123
+msgid "Unstable"
+msgstr "Inestable"
 
-#: ../../include/widgets.php:1384 ../../include/widgets.php:1422
-msgid "Member registrations waiting for confirmation"
-msgstr "Inscripciones de nuevos miembros pendientes de aprobación"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Divorced"
+msgstr "Divorciado/a"
 
-#: ../../include/widgets.php:1387 ../../include/apps.php:184
-msgid "Features"
-msgstr "Funcionalidades"
+#: ../../include/selectors.php:123
+msgid "Imaginarily divorced"
+msgstr "Divorciado/a en sueños"
 
-#: ../../include/widgets.php:1390
-msgid "Inspect queue"
-msgstr "Examinar la cola"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Widowed"
+msgstr "Viudo/a"
 
-#: ../../include/widgets.php:1392
-msgid "DB updates"
-msgstr "Actualizaciones de la base de datos"
+#: ../../include/selectors.php:123
+msgid "Uncertain"
+msgstr "Indeterminado"
 
-#: ../../include/widgets.php:1417 ../../include/nav.php:216
-msgid "Admin"
-msgstr "Administrador"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "It's complicated"
+msgstr "Es complicado"
 
-#: ../../include/widgets.php:1418
-msgid "Plugin Features"
-msgstr "Extensiones"
+#: ../../include/selectors.php:123
+msgid "Don't care"
+msgstr "No me importa"
+
+#: ../../include/selectors.php:123
+msgid "Ask me"
+msgstr "Pregúnteme"
+
+#: ../../include/bbcode.php:123 ../../include/bbcode.php:844
+#: ../../include/bbcode.php:847 ../../include/bbcode.php:852
+#: ../../include/bbcode.php:855 ../../include/bbcode.php:858
+#: ../../include/bbcode.php:861 ../../include/bbcode.php:866
+#: ../../include/bbcode.php:869 ../../include/bbcode.php:874
+#: ../../include/bbcode.php:877 ../../include/bbcode.php:880
+#: ../../include/bbcode.php:883
+msgid "Image/photo"
+msgstr "Imagen/foto"
+
+#: ../../include/bbcode.php:162 ../../include/bbcode.php:894
+msgid "Encrypted content"
+msgstr "Contenido cifrado"
+
+#: ../../include/bbcode.php:178
+#, php-format
+msgid "Install %s element: "
+msgstr "Instalar el elemento %s:"
+
+#: ../../include/bbcode.php:182
+#, php-format
+msgid ""
+"This post contains an installable %s element, however you lack permissions "
+"to install it on this site."
+msgstr "Esta entrada contiene el elemento instalable %s, sin embargo le faltan permisos para instalarlo en este sitio."
+
+#: ../../include/bbcode.php:254
+#, php-format
+msgid "%1$s wrote the following %2$s %3$s"
+msgstr "%1$s escribió %2$s siguiente %3$s"
+
+#: ../../include/bbcode.php:331 ../../include/bbcode.php:339
+msgid "Click to open/close"
+msgstr "Pulsar para abrir/cerrar"
+
+#: ../../include/bbcode.php:339
+msgid "spoiler"
+msgstr "spoiler"
+
+#: ../../include/bbcode.php:585
+msgid "Different viewers will see this text differently"
+msgstr "Visitantes diferentes verán este texto de forma distinta"
+
+#: ../../include/bbcode.php:832
+msgid "$1 wrote:"
+msgstr "$1 escribió:"
 
 #: ../../include/bookmarks.php:35
 #, php-format
 msgid "%1$s's bookmarks"
 msgstr "Marcadores de %1$s"
 
-#: ../../include/chat.php:23
-msgid "Missing room name"
-msgstr "Sala de chat sin nombre"
+#: ../../include/attach.php:247 ../../include/attach.php:333
+msgid "Item was not found."
+msgstr "Elemento no encontrado."
 
-#: ../../include/chat.php:32
-msgid "Duplicate room name"
-msgstr "Nombre de sala duplicado."
+#: ../../include/attach.php:497
+msgid "No source file."
+msgstr "Ningún fichero de origen"
 
-#: ../../include/chat.php:82 ../../include/chat.php:90
-msgid "Invalid room specifier."
-msgstr "Especificador de sala no válido."
+#: ../../include/attach.php:519
+msgid "Cannot locate file to replace"
+msgstr "No se puede localizar el fichero que va a ser sustituido."
 
-#: ../../include/chat.php:122
-msgid "Room not found."
-msgstr "Sala no encontrada."
+#: ../../include/attach.php:537
+msgid "Cannot locate file to revise/update"
+msgstr "No se puede localizar el fichero para revisar/actualizar"
 
-#: ../../include/chat.php:143
-msgid "Room is full"
-msgstr "La sala está llena."
+#: ../../include/attach.php:672
+#, php-format
+msgid "File exceeds size limit of %d"
+msgstr "El fichero supera el limite de tamaño de %d"
+
+#: ../../include/attach.php:686
+#, php-format
+msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
+msgstr "Ha alcanzado su límite de %1$.0f Mbytes de almacenamiento de adjuntos."
+
+#: ../../include/attach.php:842
+msgid "File upload failed. Possible system limit or action terminated."
+msgstr "Error de carga, posiblemente por limite del sistema o porque la acción ha finalizado."
+
+#: ../../include/attach.php:855
+msgid "Stored file could not be verified. Upload failed."
+msgstr "El fichero almacenado no ha podido ser verificado. El envío ha fallado."
+
+#: ../../include/attach.php:909 ../../include/attach.php:925
+msgid "Path not available."
+msgstr "Ruta no disponible."
+
+#: ../../include/attach.php:971 ../../include/attach.php:1123
+msgid "Empty pathname"
+msgstr "Ruta vacía"
+
+#: ../../include/attach.php:997
+msgid "duplicate filename or path"
+msgstr "Nombre duplicado de ruta o fichero"
+
+#: ../../include/attach.php:1019
+msgid "Path not found."
+msgstr "Ruta no encontrada"
+
+#: ../../include/attach.php:1077
+msgid "mkdir failed."
+msgstr "mkdir ha fallado."
+
+#: ../../include/attach.php:1081
+msgid "database storage failed."
+msgstr "el almacenamiento en la base de datos ha fallado."
+
+#: ../../include/attach.php:1129
+msgid "Empty path"
+msgstr "Ruta vacía"
 
-#: ../../include/identity.php:32
+#: ../../include/channel.php:32
 msgid "Unable to obtain identity information from database"
 msgstr "No ha sido posible obtener información sobre la identidad desde la base de datos"
 
-#: ../../include/identity.php:66
+#: ../../include/channel.php:66
 msgid "Empty name"
 msgstr "Nombre vacío"
 
-#: ../../include/identity.php:69
+#: ../../include/channel.php:69
 msgid "Name too long"
 msgstr "Nombre demasiado largo"
 
-#: ../../include/identity.php:180
+#: ../../include/channel.php:180
 msgid "No account identifier"
 msgstr "Ningún identificador de la cuenta"
 
-#: ../../include/identity.php:192
+#: ../../include/channel.php:192
 msgid "Nickname is required."
 msgstr "Se requiere un sobrenombre (alias)."
 
-#: ../../include/identity.php:206
+#: ../../include/channel.php:206
 msgid "Reserved nickname. Please choose another."
 msgstr "Sobrenombre en uso. Por favor, elija otro."
 
-#: ../../include/identity.php:211
+#: ../../include/channel.php:211
 msgid ""
 "Nickname has unsupported characters or is already being used on this site."
 msgstr "El alias contiene caracteres no admitidos o está ya en uso por otros miembros de este sitio."
 
-#: ../../include/identity.php:287
+#: ../../include/channel.php:287
 msgid "Unable to retrieve created identity"
 msgstr "No ha sido posible recuperar la identidad creada"
 
-#: ../../include/identity.php:345
+#: ../../include/channel.php:345
 msgid "Default Profile"
 msgstr "Perfil principal"
 
-#: ../../include/identity.php:791
+#: ../../include/channel.php:791
 msgid "Requested channel is not available."
 msgstr "El canal solicitado no está disponible."
 
-#: ../../include/identity.php:938
+#: ../../include/channel.php:938
 msgid "Create New Profile"
 msgstr "Crear un nuevo perfil"
 
-#: ../../include/identity.php:941 ../../include/nav.php:90
+#: ../../include/channel.php:941 ../../include/nav.php:90
 msgid "Edit Profile"
 msgstr "Editar el perfil"
 
-#: ../../include/identity.php:958
+#: ../../include/channel.php:958
 msgid "Visible to everybody"
 msgstr "Visible para todos"
 
-#: ../../include/identity.php:1033 ../../include/identity.php:1288
+#: ../../include/channel.php:1031 ../../include/channel.php:1142
 msgid "Gender:"
 msgstr "Género:"
 
-#: ../../include/identity.php:1034 ../../include/identity.php:1332
+#: ../../include/channel.php:1032 ../../include/channel.php:1186
 msgid "Status:"
 msgstr "Estado:"
 
-#: ../../include/identity.php:1035 ../../include/identity.php:1343
+#: ../../include/channel.php:1033 ../../include/channel.php:1197
 msgid "Homepage:"
 msgstr "Página personal:"
 
-#: ../../include/identity.php:1036
+#: ../../include/channel.php:1034
 msgid "Online Now"
 msgstr "Ahora en línea"
 
-#: ../../include/identity.php:1124 ../../include/identity.php:1200
-msgid "F d"
-msgstr "d F"
-
-#: ../../include/identity.php:1180
-msgid "Birthday Reminders"
-msgstr "Recordatorios de cumpleaños"
-
-#: ../../include/identity.php:1181
-msgid "Birthdays this week:"
-msgstr "Cumpleaños de esta semana:"
-
-#: ../../include/identity.php:1232
-msgid "[No description]"
-msgstr "[Sin descripción]"
-
-#: ../../include/identity.php:1250
-msgid "Event Reminders"
-msgstr "Recordatorios de eventos"
-
-#: ../../include/identity.php:1251
-msgid "Events this week:"
-msgstr "Eventos de esta semana:"
-
-#: ../../include/identity.php:1293
+#: ../../include/channel.php:1147
 msgid "Like this channel"
 msgstr "Me gusta este canal"
 
-#: ../../include/identity.php:1317
+#: ../../include/channel.php:1171
 msgid "j F, Y"
 msgstr "j F Y"
 
-#: ../../include/identity.php:1318
+#: ../../include/channel.php:1172
 msgid "j F"
 msgstr "j F"
 
-#: ../../include/identity.php:1325
+#: ../../include/channel.php:1179
 msgid "Birthday:"
 msgstr "Cumpleaños:"
 
-#: ../../include/identity.php:1338
+#: ../../include/channel.php:1192
 #, php-format
 msgid "for %1$d %2$s"
 msgstr "por %1$d %2$s"
 
-#: ../../include/identity.php:1341
+#: ../../include/channel.php:1195
 msgid "Sexual Preference:"
 msgstr "Orientación sexual:"
 
-#: ../../include/identity.php:1347
+#: ../../include/channel.php:1201
 msgid "Tags:"
 msgstr "Etiquetas:"
 
-#: ../../include/identity.php:1349
+#: ../../include/channel.php:1203
 msgid "Political Views:"
 msgstr "Posición política:"
 
-#: ../../include/identity.php:1351
+#: ../../include/channel.php:1205
 msgid "Religion:"
 msgstr "Religión:"
 
-#: ../../include/identity.php:1355
+#: ../../include/channel.php:1209
 msgid "Hobbies/Interests:"
 msgstr "Aficciones o intereses:"
 
-#: ../../include/identity.php:1357
+#: ../../include/channel.php:1211
 msgid "Likes:"
 msgstr "Me gusta:"
 
-#: ../../include/identity.php:1359
+#: ../../include/channel.php:1213
 msgid "Dislikes:"
 msgstr "No me gusta:"
 
-#: ../../include/identity.php:1361
+#: ../../include/channel.php:1215
 msgid "Contact information and Social Networks:"
 msgstr "Información de contacto y redes sociales:"
 
-#: ../../include/identity.php:1363
+#: ../../include/channel.php:1217
 msgid "My other channels:"
 msgstr "Mis otros canales:"
 
-#: ../../include/identity.php:1365
+#: ../../include/channel.php:1219
 msgid "Musical interests:"
 msgstr "Preferencias musicales:"
 
-#: ../../include/identity.php:1367
+#: ../../include/channel.php:1221
 msgid "Books, literature:"
 msgstr "Libros, literatura:"
 
-#: ../../include/identity.php:1369
+#: ../../include/channel.php:1223
 msgid "Television:"
 msgstr "Televisión:"
 
-#: ../../include/identity.php:1371
+#: ../../include/channel.php:1225
 msgid "Film/dance/culture/entertainment:"
 msgstr "Cine, danza, cultura, entretenimiento:"
 
-#: ../../include/identity.php:1373
+#: ../../include/channel.php:1227
 msgid "Love/Romance:"
 msgstr "Vida sentimental o amorosa:"
 
-#: ../../include/identity.php:1375
+#: ../../include/channel.php:1229
 msgid "Work/employment:"
 msgstr "Trabajo:"
 
-#: ../../include/identity.php:1377
+#: ../../include/channel.php:1231
 msgid "School/education:"
 msgstr "Estudios:"
 
-#: ../../include/identity.php:1397
+#: ../../include/channel.php:1251
 msgid "Like this thing"
 msgstr "Me gusta esto"
 
@@ -7155,38 +7791,7 @@ msgid ""
 "form has been opened for too long (>3 hours) before submitting it."
 msgstr "El \"token\" de seguridad del formulario no es correcto. Esto ha ocurrido probablemente porque el formulario ha estado abierto demasiado tiempo (>3 horas) antes de ser enviado"
 
-#: ../../include/photos.php:112
-#, php-format
-msgid "Image exceeds website size limit of %lu bytes"
-msgstr "La imagen excede el límite de %lu bytes del sitio"
-
-#: ../../include/photos.php:119
-msgid "Image file is empty."
-msgstr "El fichero de imagen está vacío. "
-
-#: ../../include/photos.php:257
-msgid "Photo storage failed."
-msgstr "La foto no ha podido ser guardada."
-
-#: ../../include/photos.php:297
-msgid "a new photo"
-msgstr "una nueva foto"
-
-#: ../../include/photos.php:301
-#, php-format
-msgctxt "photo_upload"
-msgid "%1$s posted %2$s to %3$s"
-msgstr "%1$s ha publicado %2$s en %3$s"
-
-#: ../../include/photos.php:506 ../../include/conversation.php:1641
-msgid "Photo Albums"
-msgstr "Álbumes de fotos"
-
-#: ../../include/photos.php:510
-msgid "Upload New Photos"
-msgstr "Subir nuevas fotos"
-
-#: ../../include/nav.php:82 ../../include/nav.php:113 ../../boot.php:1628
+#: ../../include/nav.php:82 ../../include/nav.php:113 ../../boot.php:1694
 msgid "Logout"
 msgstr "Finalizar sesión"
 
@@ -7222,18 +7827,10 @@ msgstr "Sus fotos"
 msgid "Your files"
 msgstr "Sus ficheros"
 
-#: ../../include/nav.php:96 ../../include/apps.php:178
-msgid "Chat"
-msgstr "Chat"
-
 #: ../../include/nav.php:96
 msgid "Your chatrooms"
 msgstr "Sus salas de chat"
 
-#: ../../include/nav.php:102 ../../include/conversation.php:1682
-msgid "Bookmarks"
-msgstr "Marcadores"
-
 #: ../../include/nav.php:102
 msgid "Your bookmarks"
 msgstr "Sus marcadores"
@@ -7242,10 +7839,6 @@ msgstr "Sus marcadores"
 msgid "Your webpages"
 msgstr "Sus páginas web"
 
-#: ../../include/nav.php:110 ../../include/apps.php:163 ../../boot.php:1629
-msgid "Login"
-msgstr "Iniciar sesión"
-
 #: ../../include/nav.php:110
 msgid "Sign in"
 msgstr "Acceder"
@@ -7283,18 +7876,10 @@ msgstr "Aplicaciones, utilidades, enlaces, juegos"
 msgid "Search site @name, #tag, ?docs, content"
 msgstr "Buscar en el sitio por @nombre, #etiqueta, ?ayuda o contenido"
 
-#: ../../include/nav.php:167 ../../include/apps.php:173
-msgid "Directory"
-msgstr "Directorio"
-
 #: ../../include/nav.php:167
 msgid "Channel Directory"
 msgstr "Directorio de canales"
 
-#: ../../include/nav.php:179 ../../include/apps.php:165
-msgid "Grid"
-msgstr "Red"
-
 #: ../../include/nav.php:179
 msgid "Your grid"
 msgstr "Mi red"
@@ -7303,10 +7888,6 @@ msgstr "Mi red"
 msgid "Mark all grid notifications seen"
 msgstr "Marcar todas las notificaciones de la red como vistas"
 
-#: ../../include/nav.php:182 ../../include/apps.php:169
-msgid "Channel Home"
-msgstr "Mi canal"
-
 #: ../../include/nav.php:182
 msgid "Channel home"
 msgstr "Mi canal"
@@ -7327,10 +7908,6 @@ msgstr "Notificaciones"
 msgid "See all notifications"
 msgstr "Ver todas las notificaciones"
 
-#: ../../include/nav.php:193 ../../include/apps.php:175
-msgid "Mail"
-msgstr "Correo"
-
 #: ../../include/nav.php:193
 msgid "Private mail"
 msgstr "Correo privado"
@@ -7343,10 +7920,17 @@ msgstr "Ver todas los mensajes privados"
 msgid "Mark all private messages seen"
 msgstr "Marcar todos los mensajes privados como leídos"
 
-#: ../../include/nav.php:201 ../../include/conversation.php:1655
-#: ../../include/conversation.php:1658 ../../include/apps.php:172
-msgid "Events"
-msgstr "Eventos"
+#: ../../include/nav.php:196 ../../include/widgets.php:658
+msgid "Inbox"
+msgstr "Bandeja de entrada"
+
+#: ../../include/nav.php:197 ../../include/widgets.php:663
+msgid "Outbox"
+msgstr "Bandeja de salida"
+
+#: ../../include/nav.php:198 ../../include/widgets.php:668
+msgid "New Message"
+msgstr "Nuevo mensaje"
 
 #: ../../include/nav.php:201
 msgid "Event Calendar"
@@ -7368,14 +7952,14 @@ msgstr "Gestionar sus canales"
 msgid "Account/Channel Settings"
 msgstr "Ajustes de cuenta/canales"
 
+#: ../../include/nav.php:216 ../../include/widgets.php:1414
+msgid "Admin"
+msgstr "Administrador"
+
 #: ../../include/nav.php:216
 msgid "Site Setup and Configuration"
 msgstr "Ajustes y configuración del sitio"
 
-#: ../../include/nav.php:247 ../../include/conversation.php:854
-msgid "Loading..."
-msgstr "Cargando..."
-
 #: ../../include/nav.php:252
 msgid "@name, #tag, ?doc, content"
 msgstr "@nombre, #etiqueta, ?ayuda, contenido"
@@ -7384,663 +7968,541 @@ msgstr "@nombre, #etiqueta, ?ayuda, contenido"
 msgid "Please wait..."
 msgstr "Espere por favor…"
 
-#: ../../include/contact_selectors.php:56
-msgid "Frequently"
-msgstr "Frecuentemente"
+#: ../../include/widgets.php:103
+msgid "System"
+msgstr "Sistema"
 
-#: ../../include/contact_selectors.php:57
-msgid "Hourly"
-msgstr "Cada hora"
+#: ../../include/widgets.php:106
+msgid "New App"
+msgstr "Nueva aplicación (app)"
 
-#: ../../include/contact_selectors.php:58
-msgid "Twice daily"
-msgstr "Dos veces al día"
+#: ../../include/widgets.php:154
+msgid "Suggestions"
+msgstr "Sugerencias"
 
-#: ../../include/contact_selectors.php:59
-msgid "Daily"
-msgstr "Diariamente"
+#: ../../include/widgets.php:155
+msgid "See more..."
+msgstr "Ver más..."
 
-#: ../../include/contact_selectors.php:60
-msgid "Weekly"
-msgstr "Semanalmente"
+#: ../../include/widgets.php:175
+#, php-format
+msgid "You have %1$.0f of %2$.0f allowed connections."
+msgstr "Tiene %1$.0f de %2$.0f conexiones permitidas."
 
-#: ../../include/contact_selectors.php:61
-msgid "Monthly"
-msgstr "Mensualmente"
+#: ../../include/widgets.php:181
+msgid "Add New Connection"
+msgstr "Añadir nueva conexión"
 
-#: ../../include/contact_selectors.php:76
-#: ../../include/contact_selectors.php:77
-msgid "Friendica"
-msgstr "Friendica"
+#: ../../include/widgets.php:182
+msgid "Enter channel address"
+msgstr "Dirección del canal"
 
-#: ../../include/contact_selectors.php:78
-msgid "OStatus"
-msgstr "OStatus"
+#: ../../include/widgets.php:183
+msgid "Examples: bob@example.com, https://example.com/barbara"
+msgstr "Ejemplos: manuel@ejemplo.com, https://ejemplo.com/carmen"
 
-#: ../../include/contact_selectors.php:79
-msgid "GNU-Social"
-msgstr "GNU Social"
+#: ../../include/widgets.php:199
+msgid "Notes"
+msgstr "Notas"
 
-#: ../../include/contact_selectors.php:80
-msgid "RSS/Atom"
-msgstr "RSS/Atom"
+#: ../../include/widgets.php:273
+msgid "Remove term"
+msgstr "Eliminar término"
 
-#: ../../include/contact_selectors.php:82
-msgid "Diaspora"
-msgstr "Diaspora"
+#: ../../include/widgets.php:281 ../../include/features.php:84
+msgid "Saved Searches"
+msgstr "Búsquedas guardadas"
 
-#: ../../include/contact_selectors.php:83
-msgid "Facebook"
-msgstr "Facebook"
+#: ../../include/widgets.php:282 ../../include/group.php:316
+msgid "add"
+msgstr "añadir"
 
-#: ../../include/contact_selectors.php:84
-msgid "Zot"
-msgstr "Zot"
+#: ../../include/widgets.php:354
+msgid "Archives"
+msgstr "Hemeroteca"
 
-#: ../../include/contact_selectors.php:85
-msgid "LinkedIn"
-msgstr "LinkedIn"
+#: ../../include/widgets.php:516
+msgid "Refresh"
+msgstr "Recargar"
 
-#: ../../include/contact_selectors.php:86
-msgid "XMPP/IM"
-msgstr "XMPP/IM"
+#: ../../include/widgets.php:556
+msgid "Account settings"
+msgstr "Configuración de la cuenta"
 
-#: ../../include/contact_selectors.php:87
-msgid "MySpace"
-msgstr "MySpace"
+#: ../../include/widgets.php:562
+msgid "Channel settings"
+msgstr "Configuración del canal"
 
-#: ../../include/auth.php:105
-msgid "Logged out."
-msgstr "Desconectado/a."
+#: ../../include/widgets.php:571
+msgid "Additional features"
+msgstr "Funcionalidades"
 
-#: ../../include/auth.php:212
-msgid "Failed authentication"
-msgstr "Autenticación fallida."
+#: ../../include/widgets.php:578
+msgid "Feature/Addon settings"
+msgstr "Complementos"
 
-#: ../../include/attach.php:247 ../../include/attach.php:333
-msgid "Item was not found."
-msgstr "Elemento no encontrado."
+#: ../../include/widgets.php:584
+msgid "Display settings"
+msgstr "Ajustes de visualización"
 
-#: ../../include/attach.php:497
-msgid "No source file."
-msgstr "Ningún fichero de origen"
+#: ../../include/widgets.php:591
+msgid "Manage locations"
+msgstr "Gestión de ubicaciones (clones) del canal"
 
-#: ../../include/attach.php:519
-msgid "Cannot locate file to replace"
-msgstr "No se puede localizar el fichero que va a ser sustituido."
+#: ../../include/widgets.php:600
+msgid "Export channel"
+msgstr "Exportar canal"
 
-#: ../../include/attach.php:537
-msgid "Cannot locate file to revise/update"
-msgstr "No se puede localizar el fichero para revisar/actualizar"
+#: ../../include/widgets.php:607
+msgid "Connected apps"
+msgstr "Aplicaciones (apps) conectadas"
 
-#: ../../include/attach.php:672
-#, php-format
-msgid "File exceeds size limit of %d"
-msgstr "El fichero supera el limite de tamaño de %d"
+#: ../../include/widgets.php:622
+msgid "Premium Channel Settings"
+msgstr "Configuración del canal premium"
 
-#: ../../include/attach.php:686
-#, php-format
-msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
-msgstr "Ha alcanzado su límite de %1$.0f Mbytes de almacenamiento de adjuntos."
+#: ../../include/widgets.php:651
+msgid "Private Mail Menu"
+msgstr "Menú de correo privado"
 
-#: ../../include/attach.php:842
-msgid "File upload failed. Possible system limit or action terminated."
-msgstr "Error de carga, posiblemente por limite del sistema o porque la acción ha finalizado."
+#: ../../include/widgets.php:653
+msgid "Combined View"
+msgstr "Vista combinada"
 
-#: ../../include/attach.php:855
-msgid "Stored file could not be verified. Upload failed."
-msgstr "El fichero almacenado no ha podido ser verificado. El envío ha fallado."
+#: ../../include/widgets.php:685 ../../include/widgets.php:697
+msgid "Conversations"
+msgstr "Conversaciones"
 
-#: ../../include/attach.php:909 ../../include/attach.php:925
-msgid "Path not available."
-msgstr "Ruta no disponible."
+#: ../../include/widgets.php:689
+msgid "Received Messages"
+msgstr "Mensajes recibidos"
 
-#: ../../include/attach.php:971 ../../include/attach.php:1123
-msgid "Empty pathname"
-msgstr "Ruta vacía"
+#: ../../include/widgets.php:693
+msgid "Sent Messages"
+msgstr "Enviar mensajes"
 
-#: ../../include/attach.php:997
-msgid "duplicate filename or path"
-msgstr "Nombre duplicado de ruta o fichero"
+#: ../../include/widgets.php:707
+msgid "No messages."
+msgstr "Sin mensajes."
 
-#: ../../include/attach.php:1019
-msgid "Path not found."
-msgstr "Ruta no encontrada"
+#: ../../include/widgets.php:725
+msgid "Delete conversation"
+msgstr "Eliminar conversación"
 
-#: ../../include/attach.php:1077
-msgid "mkdir failed."
-msgstr "mkdir ha fallado."
+#: ../../include/widgets.php:751
+msgid "Events Menu"
+msgstr "Menú de eventos"
 
-#: ../../include/attach.php:1081
-msgid "database storage failed."
-msgstr "el almacenamiento en la base de datos ha fallado."
+#: ../../include/widgets.php:752
+msgid "Day View"
+msgstr "Eventos del día"
 
-#: ../../include/attach.php:1129
-msgid "Empty path"
-msgstr "Ruta vacía"
+#: ../../include/widgets.php:753
+msgid "Week View"
+msgstr "Eventos de la semana"
+
+#: ../../include/widgets.php:754
+msgid "Month View"
+msgstr "Eventos del mes"
+
+#: ../../include/widgets.php:766
+msgid "Events Tools"
+msgstr "Gestión de eventos"
+
+#: ../../include/widgets.php:767
+msgid "Export Calendar"
+msgstr "Exportar el calendario"
+
+#: ../../include/widgets.php:768
+msgid "Import Calendar"
+msgstr "Importar un calendario"
+
+#: ../../include/widgets.php:844
+msgid "Overview"
+msgstr "Resumen"
+
+#: ../../include/widgets.php:851
+msgid "Chat Members"
+msgstr "Miembros del chat"
+
+#: ../../include/widgets.php:874
+msgid "Bookmarked Chatrooms"
+msgstr "Salas de chat preferidas"
+
+#: ../../include/widgets.php:897
+msgid "Suggested Chatrooms"
+msgstr "Salas de chat sugeridas"
+
+#: ../../include/widgets.php:1042 ../../include/widgets.php:1154
+msgid "photo/image"
+msgstr "foto/imagen"
+
+#: ../../include/widgets.php:1097
+msgid "Click to show more"
+msgstr "Hacer clic para ver más"
+
+#: ../../include/widgets.php:1248
+msgid "Rating Tools"
+msgstr "Valoraciones"
+
+#: ../../include/widgets.php:1252 ../../include/widgets.php:1254
+msgid "Rate Me"
+msgstr "Valorar este canal"
+
+#: ../../include/widgets.php:1257
+msgid "View Ratings"
+msgstr "Mostrar las valoraciones"
+
+#: ../../include/widgets.php:1314
+msgid "Forums"
+msgstr "Foros"
+
+#: ../../include/widgets.php:1343
+msgid "Tasks"
+msgstr "Tareas"
+
+#: ../../include/widgets.php:1352
+msgid "Documentation"
+msgstr "Documentación"
+
+#: ../../include/widgets.php:1354
+msgid "Project/Site Information"
+msgstr "Información sobre el proyecto o sitio"
+
+#: ../../include/widgets.php:1355
+msgid "For Members"
+msgstr "Para los miembros"
+
+#: ../../include/widgets.php:1356
+msgid "For Administrators"
+msgstr "Para los administradores"
+
+#: ../../include/widgets.php:1357
+msgid "For Developers"
+msgstr "Para los desarrolladores"
+
+#: ../../include/widgets.php:1381
+msgid "Accounts"
+msgstr "Cuentas"
+
+#: ../../include/widgets.php:1381 ../../include/widgets.php:1419
+msgid "Member registrations waiting for confirmation"
+msgstr "Inscripciones de nuevos miembros pendientes de aprobación"
+
+#: ../../include/widgets.php:1387
+msgid "Inspect queue"
+msgstr "Examinar la cola"
+
+#: ../../include/widgets.php:1389
+msgid "DB updates"
+msgstr "Actualizaciones de la base de datos"
+
+#: ../../include/widgets.php:1415
+msgid "Plugin Features"
+msgstr "Extensiones"
+
+#: ../../include/acl_selectors.php:232
+#: ../../include/PermissionDescription.php:31
+msgid "Visible to your default audience"
+msgstr "Visible para su público predeterminado."
+
+#: ../../include/acl_selectors.php:268
+#: ../../include/PermissionDescription.php:115
+msgid "Only me"
+msgstr "Sólo yo"
+
+#: ../../include/acl_selectors.php:271
+msgid "Who can see this?"
+msgstr "¿Quién puede ver esto?"
+
+#: ../../include/acl_selectors.php:272
+msgid "Custom selection"
+msgstr "Selección personalizada"
+
+#: ../../include/acl_selectors.php:273
+msgid ""
+"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit"
+" the scope of \"Show\"."
+msgstr "Seleccione \"Mostrar\" para permitir la visualización. La opción \"No mostrar\" le permite anular y limitar el alcance de \"Mostrar\"."
 
-#: ../../include/datetime.php:136
+#: ../../include/acl_selectors.php:274
+msgid "Show"
+msgstr "Mostrar"
+
+#: ../../include/acl_selectors.php:275
+msgid "Don't show"
+msgstr "No mostrar"
+
+#: ../../include/acl_selectors.php:281
+msgid "Other networks and post services"
+msgstr "Otras redes y servicios de publicación"
+
+#: ../../include/acl_selectors.php:311
+#, php-format
+msgid ""
+"Post permissions %s cannot be changed %s after a post is shared.</br />These"
+" permissions set who is allowed to view the post."
+msgstr "Los permisos de la entrada %s no se pueden cambiar %s una vez que se ha compartido.</br /> Estos permisos establecen quién está autorizado para ver el mensaje."
+
+#: ../../include/datetime.php:135
 msgid "Birthday"
 msgstr "Cumpleaños"
 
-#: ../../include/datetime.php:138
+#: ../../include/datetime.php:137
 msgid "Age: "
 msgstr "Edad:"
 
-#: ../../include/datetime.php:140
+#: ../../include/datetime.php:139
 msgid "YYYY-MM-DD or MM-DD"
 msgstr "AAAA-MM-DD o MM-DD"
 
-#: ../../include/datetime.php:273 ../../boot.php:2399
+#: ../../include/datetime.php:272 ../../boot.php:2462
 msgid "never"
 msgstr "nunca"
 
-#: ../../include/datetime.php:279
+#: ../../include/datetime.php:278
 msgid "less than a second ago"
 msgstr "hace un instante"
 
-#: ../../include/datetime.php:297
+#: ../../include/datetime.php:296
 #, php-format
 msgctxt "e.g. 22 hours ago, 1 minute ago"
 msgid "%1$d %2$s ago"
 msgstr "hace %1$d %2$s"
 
-#: ../../include/datetime.php:308
+#: ../../include/datetime.php:307
 msgctxt "relative_date"
 msgid "year"
 msgid_plural "years"
 msgstr[0] "año"
 msgstr[1] "años"
 
-#: ../../include/datetime.php:311
+#: ../../include/datetime.php:310
 msgctxt "relative_date"
 msgid "month"
 msgid_plural "months"
 msgstr[0] "mes"
 msgstr[1] "meses"
 
-#: ../../include/datetime.php:314
+#: ../../include/datetime.php:313
 msgctxt "relative_date"
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "semana"
 msgstr[1] "semanas"
 
-#: ../../include/datetime.php:317
+#: ../../include/datetime.php:316
 msgctxt "relative_date"
 msgid "day"
 msgid_plural "days"
 msgstr[0] "día"
 msgstr[1] "días"
 
-#: ../../include/datetime.php:320
+#: ../../include/datetime.php:319
 msgctxt "relative_date"
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "horas"
 
-#: ../../include/datetime.php:323
+#: ../../include/datetime.php:322
 msgctxt "relative_date"
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutos"
 
-#: ../../include/datetime.php:326
+#: ../../include/datetime.php:325
 msgctxt "relative_date"
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "segundo"
 msgstr[1] "segundos"
 
-#: ../../include/datetime.php:563
+#: ../../include/datetime.php:562
 #, php-format
 msgid "%1$s's birthday"
 msgstr "Cumpleaños de %1$s"
 
-#: ../../include/datetime.php:564
+#: ../../include/datetime.php:563
 #, php-format
 msgid "Happy Birthday %1$s"
 msgstr "Feliz cumpleaños %1$s"
 
-#: ../../include/dir_fns.php:139
-msgid "Directory Options"
-msgstr "Opciones del directorio"
-
-#: ../../include/dir_fns.php:141
-msgid "Safe Mode"
-msgstr "Modo seguro"
-
-#: ../../include/dir_fns.php:142
-msgid "Public Forums Only"
-msgstr "Solo foros públicos"
-
-#: ../../include/dir_fns.php:143
-msgid "This Website Only"
-msgstr "Solo este sitio web"
-
-#: ../../include/enotify.php:57 ../../include/network.php:1831
-msgid "$Projectname Notification"
-msgstr "Notificación de $Projectname"
-
-#: ../../include/enotify.php:58 ../../include/network.php:1832
-msgid "$projectname"
-msgstr "$projectname"
-
-#: ../../include/enotify.php:60 ../../include/network.php:1834
-msgid "Thank You,"
-msgstr "Gracias,"
-
-#: ../../include/enotify.php:62 ../../include/network.php:1836
-#, php-format
-msgid "%s Administrator"
-msgstr "%s Administrador"
-
-#: ../../include/enotify.php:96
-#, php-format
-msgid "%s <!item_type!>"
-msgstr "%s <!item_type!>"
-
-#: ../../include/enotify.php:100
-#, php-format
-msgid "[Hubzilla:Notify] New mail received at %s"
-msgstr "[Hubzilla:Aviso] Nuevo mensaje en %s"
-
-#: ../../include/enotify.php:102
-#, php-format
-msgid "%1$s, %2$s sent you a new private message at %3$s."
-msgstr "%1$s, %2$s le ha enviado un nuevo mensaje privado en %3$s."
-
-#: ../../include/enotify.php:103
-#, php-format
-msgid "%1$s sent you %2$s."
-msgstr "%1$s le ha enviado %2$s."
-
-#: ../../include/enotify.php:103
-msgid "a private message"
-msgstr "un mensaje privado"
+#: ../../include/account.php:28
+msgid "Not a valid email address"
+msgstr "Dirección de correo no válida"
 
-#: ../../include/enotify.php:104
-#, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
-msgstr "Por favor visite %s para ver y/o responder a su mensaje privado."
+#: ../../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/enotify.php:160
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
-msgstr "%1$s, %2$s ha comentado [zrl=%3$s]%4$s[/zrl]"
+#: ../../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/enotify.php:168
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
-msgstr "%1$s, %2$s ha comentado [zrl=%3$s]%5$s de %4$s[/zrl] "
+#: ../../include/account.php:68
+msgid "An invitation is required."
+msgstr "Es obligatorio que le inviten."
 
-#: ../../include/enotify.php:177
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
-msgstr "%1$s, %2$s ha comentado [zrl=%3$s]%4$s creado por usted[/zrl]"
+#: ../../include/account.php:72
+msgid "Invitation could not be verified."
+msgstr "No se ha podido verificar su invitación."
 
-#: ../../include/enotify.php:188
-#, php-format
-msgid "[Hubzilla:Notify] Comment to conversation #%1$d by %2$s"
-msgstr "[Hubzilla:Aviso] Nuevo comentario de %2$s a la conversación #%1$d"
+#: ../../include/account.php:122
+msgid "Please enter the required information."
+msgstr "Por favor introduzca la información requerida."
 
-#: ../../include/enotify.php:189
-#, php-format
-msgid "%1$s, %2$s commented on an item/conversation you have been following."
-msgstr "%1$s, %2$s ha comentado un elemento/conversación que ha estado siguiendo."
+#: ../../include/account.php:189
+msgid "Failed to store account information."
+msgstr "La información de la cuenta no se ha podido guardar."
 
-#: ../../include/enotify.php:192 ../../include/enotify.php:207
-#: ../../include/enotify.php:233 ../../include/enotify.php:251
-#: ../../include/enotify.php:265
+#: ../../include/account.php:249
 #, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
-msgstr "Para ver o comentar la conversación, visite %s"
+msgid "Registration confirmation for %s"
+msgstr "Confirmación de registro para %s"
 
-#: ../../include/enotify.php:198
+#: ../../include/account.php:315
 #, php-format
-msgid "[Hubzilla:Notify] %s posted to your profile wall"
-msgstr "[Hubzilla:Aviso] %s ha publicado una entrada en su página de inicio del perfil (\"muro\")"
+msgid "Registration request at %s"
+msgstr "Solicitud de registro en %s"
 
-#: ../../include/enotify.php:200
-#, php-format
-msgid "%1$s, %2$s posted to your profile wall at %3$s"
-msgstr "%1$s, %2$s ha publicado en su página del perfil en %3$s"
+#: ../../include/account.php:339
+msgid "your registration password"
+msgstr "su contraseña de registro"
 
-#: ../../include/enotify.php:202
+#: ../../include/account.php:342 ../../include/account.php:402
 #, php-format
-msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
-msgstr "%1$s, %2$s ha publicado en [zrl=%3$s]su página del perfil[/zrl]"
+msgid "Registration details for %s"
+msgstr "Detalles del registro de %s"
 
-#: ../../include/enotify.php:226
-#, php-format
-msgid "[Hubzilla:Notify] %s tagged you"
-msgstr "[Hubzilla:Aviso] %s le ha etiquetado"
+#: ../../include/account.php:414
+msgid "Account approved."
+msgstr "Cuenta aprobada."
 
-#: ../../include/enotify.php:227
+#: ../../include/account.php:454
 #, php-format
-msgid "%1$s, %2$s tagged you at %3$s"
-msgstr "%1$s, %2$s le ha etiquetado en %3$s"
+msgid "Registration revoked for %s"
+msgstr "Registro revocado para %s"
 
-#: ../../include/enotify.php:228
-#, php-format
-msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
-msgstr "%1$s, %2$s [zrl=%3$s]le etiquetó[/zrl]."
+#: ../../include/account.php:506
+msgid "Account verified. Please login."
+msgstr "Cuenta verificada. Por favor, inicie sesión."
 
-#: ../../include/enotify.php:240
-#, php-format
-msgid "[Hubzilla:Notify] %1$s poked you"
-msgstr "[Hubzilla:Aviso] %1$s le ha dado un toque"
+#: ../../include/account.php:723 ../../include/account.php:725
+msgid "Click here to upgrade."
+msgstr "Pulse aquí para actualizar"
 
-#: ../../include/enotify.php:241
-#, php-format
-msgid "%1$s, %2$s poked you at %3$s"
-msgstr "%1$s, %2$s le ha dado un toque en %3$s"
+#: ../../include/account.php:731
+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/enotify.php:242
-#, php-format
-msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
-msgstr "%1$s, %2$s [zrl=%2$s]le ha dado un toque[/zrl]."
+#: ../../include/account.php:736
+msgid "This action is not available under your subscription plan."
+msgstr "Esta acción no está disponible en su plan de suscripción."
 
-#: ../../include/enotify.php:258
-#, php-format
-msgid "[Hubzilla:Notify] %s tagged your post"
-msgstr "[Hubzilla:Aviso] %s ha etiquetado su publicación"
+#: ../../include/api.php:1336
+msgid "Public Timeline"
+msgstr "Cronología pública"
 
-#: ../../include/enotify.php:259
-#, php-format
-msgid "%1$s, %2$s tagged your post at %3$s"
-msgstr "%1$s, %2$s ha etiquetado su publicación en %3$s"
+#: ../../include/auth.php:105
+msgid "Logged out."
+msgstr "Desconectado/a."
 
-#: ../../include/enotify.php:260
-#, php-format
-msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
-msgstr "%1$s, %2$s ha etiquetado [zrl=%3$s]su publicación[/zrl]"
+#: ../../include/auth.php:212
+msgid "Failed authentication"
+msgstr "Autenticación fallida."
 
-#: ../../include/enotify.php:272
-msgid "[Hubzilla:Notify] Introduction received"
-msgstr "[Hubzilla:Aviso] Ha recibido una solicitud de conexión"
+#: ../../include/follow.php:27
+msgid "Channel is blocked on this site."
+msgstr "El canal está bloqueado en este sitio."
 
-#: ../../include/enotify.php:273
-#, php-format
-msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
-msgstr "%1$s, ha recibido una nueva solicitud de conexión de '%2$s' en  %3$s"
+#: ../../include/follow.php:32
+msgid "Channel location missing."
+msgstr "Falta la dirección del canal."
 
-#: ../../include/enotify.php:274
-#, php-format
-msgid ""
-"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
-msgstr "%1$s, ha recibido [zrl=%2$s]una nueva solicitud de conexión[/zrl] de %3$s."
+#: ../../include/follow.php:81
+msgid "Response from remote channel was incomplete."
+msgstr "Respuesta incompleta del canal."
 
-#: ../../include/enotify.php:278 ../../include/enotify.php:297
-#, php-format
-msgid "You may visit their profile at %s"
-msgstr "Puede visitar su perfil en %s"
+#: ../../include/follow.php:98
+msgid "Channel was deleted and no longer exists."
+msgstr "El canal ha sido eliminado y ya no existe."
 
-#: ../../include/enotify.php:280
-#, php-format
-msgid "Please visit %s to approve or reject the connection request."
-msgstr "Por favor, visite %s para permitir o rechazar la solicitad de conexión."
+#: ../../include/follow.php:154 ../../include/follow.php:190
+msgid "Protocol disabled."
+msgstr "Protocolo deshabilitado."
 
-#: ../../include/enotify.php:287
-msgid "[Hubzilla:Notify] Friend suggestion received"
-msgstr "[Hubzilla:Aviso] Ha recibido una sugerencia de amistad"
+#: ../../include/follow.php:178
+msgid "Channel discovery failed."
+msgstr "El intento de acceder al canal ha fallado."
 
-#: ../../include/enotify.php:288
-#, php-format
-msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
-msgstr "%1$s, ha recibido una sugerencia de conexión de '%2$s' en %3$s"
+#: ../../include/follow.php:216
+msgid "Cannot connect to yourself."
+msgstr "No puede conectarse consigo mismo."
 
-#: ../../include/enotify.php:289
-#, php-format
+#: ../../include/import.php:29
 msgid ""
-"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from "
-"%4$s."
-msgstr "%1$s, ha recibido [zrl=%2$s]una sugerencia de conexión[/zrl] para %3$s de %4$s."
-
-#: ../../include/enotify.php:295
-msgid "Name:"
-msgstr "Nombre:"
-
-#: ../../include/enotify.php:296
-msgid "Photo:"
-msgstr "Foto:"
-
-#: ../../include/enotify.php:299
-#, php-format
-msgid "Please visit %s to approve or reject the suggestion."
-msgstr "Por favor, visite %s para aprobar o rechazar la sugerencia."
-
-#: ../../include/enotify.php:514
-msgid "[Hubzilla:Notify]"
-msgstr "[Hubzilla:Aviso]"
-
-#: ../../include/ItemObject.php:89 ../../include/conversation.php:664
-msgid "Private Message"
-msgstr "Mensaje Privado"
-
-#: ../../include/ItemObject.php:126 ../../include/conversation.php:656
-msgid "Select"
-msgstr "Seleccionar"
-
-#: ../../include/ItemObject.php:130
-msgid "Save to Folder"
-msgstr "Guardar en carpeta"
-
-#: ../../include/ItemObject.php:151
-msgid "I will attend"
-msgstr "Participaré"
-
-#: ../../include/ItemObject.php:151
-msgid "I will not attend"
-msgstr "No participaré"
-
-#: ../../include/ItemObject.php:151
-msgid "I might attend"
-msgstr "Quizá participe"
-
-#: ../../include/ItemObject.php:161
-msgid "I agree"
-msgstr "Estoy de acuerdo"
-
-#: ../../include/ItemObject.php:161
-msgid "I disagree"
-msgstr "No estoy de acuerdo"
-
-#: ../../include/ItemObject.php:161
-msgid "I abstain"
-msgstr "Me abstengo"
-
-#: ../../include/ItemObject.php:212
-msgid "Add Star"
-msgstr "Destacar añadiendo una estrella"
-
-#: ../../include/ItemObject.php:213
-msgid "Remove Star"
-msgstr "Eliminar estrella"
-
-#: ../../include/ItemObject.php:214
-msgid "Toggle Star Status"
-msgstr "Activar o desactivar el estado de entrada preferida"
-
-#: ../../include/ItemObject.php:218
-msgid "starred"
-msgstr "preferidas"
-
-#: ../../include/ItemObject.php:227 ../../include/conversation.php:671
-msgid "Message signature validated"
-msgstr "Firma de mensaje validada"
-
-#: ../../include/ItemObject.php:228 ../../include/conversation.php:672
-msgid "Message signature incorrect"
-msgstr "Firma de mensaje incorrecta"
-
-#: ../../include/ItemObject.php:236
-msgid "Add Tag"
-msgstr "Añadir etiqueta"
-
-#: ../../include/ItemObject.php:254 ../../include/taxonomy.php:316
-msgid "like"
-msgstr "me gusta"
-
-#: ../../include/ItemObject.php:255 ../../include/taxonomy.php:317
-msgid "dislike"
-msgstr "no me gusta"
-
-#: ../../include/ItemObject.php:259
-msgid "Share This"
-msgstr "Compartir esto"
-
-#: ../../include/ItemObject.php:259
-msgid "share"
-msgstr "compartir"
-
-#: ../../include/ItemObject.php:268
-msgid "Delivery Report"
-msgstr "Informe de transmisión"
-
-#: ../../include/ItemObject.php:286
-#, php-format
-msgid "%d comment"
-msgid_plural "%d comments"
-msgstr[0] "%d comentario"
-msgstr[1] "%d comentarios"
-
-#: ../../include/ItemObject.php:315 ../../include/ItemObject.php:316
-#, php-format
-msgid "View %s's profile - %s"
-msgstr "Ver el perfil de %s - %s"
+"Cannot create a duplicate channel identifier on this system. Import failed."
+msgstr "No se ha podido crear un canal con un identificador que ya existe en este sistema. La importación ha fallado."
 
-#: ../../include/ItemObject.php:319
-msgid "to"
-msgstr "a"
+#: ../../include/import.php:76
+msgid "Channel clone failed. Import failed."
+msgstr "La clonación del canal no ha salido bien. La importación ha fallado."
 
-#: ../../include/ItemObject.php:320
-msgid "via"
-msgstr "mediante"
+#: ../../include/items.php:892 ../../include/items.php:937
+msgid "(Unknown)"
+msgstr "(Desconocido)"
 
-#: ../../include/ItemObject.php:321
-msgid "Wall-to-Wall"
-msgstr "De página del perfil a página del perfil (de \"muro\" a \"muro\")"
+#: ../../include/items.php:1136
+msgid "Visible to anybody on the internet."
+msgstr "Visible para cualquiera en internet."
 
-#: ../../include/ItemObject.php:322
-msgid "via Wall-To-Wall:"
-msgstr "Mediante el procedimiento página del perfil a página del perfil (de \"muro\" a \"muro\")"
+#: ../../include/items.php:1138
+msgid "Visible to you only."
+msgstr "Visible sólo para usted."
 
-#: ../../include/ItemObject.php:334 ../../include/conversation.php:719
-#, php-format
-msgid "from %s"
-msgstr "desde %s"
+#: ../../include/items.php:1140
+msgid "Visible to anybody in this network."
+msgstr "Visible para cualquiera en esta red."
 
-#: ../../include/ItemObject.php:337 ../../include/conversation.php:722
-#, php-format
-msgid "last edited: %s"
-msgstr "último cambio: %s"
+#: ../../include/items.php:1142
+msgid "Visible to anybody authenticated."
+msgstr "Visible para cualquiera que esté autenticado."
 
-#: ../../include/ItemObject.php:338 ../../include/conversation.php:723
+#: ../../include/items.php:1144
 #, php-format
-msgid "Expires: %s"
-msgstr "Caduca: %s"
-
-#: ../../include/ItemObject.php:362
-msgid "Save Bookmarks"
-msgstr "Guardar en Marcadores"
-
-#: ../../include/ItemObject.php:363
-msgid "Add to Calendar"
-msgstr "Añadir al calendario"
-
-#: ../../include/ItemObject.php:372
-msgid "Mark all seen"
-msgstr "Marcar todo como visto"
-
-#: ../../include/ItemObject.php:413 ../../include/js_strings.php:7
-msgid "[+] show all"
-msgstr "[+] mostrar todo:"
-
-#: ../../include/ItemObject.php:704 ../../include/conversation.php:1221
-msgid "Bold"
-msgstr "Negrita"
-
-#: ../../include/ItemObject.php:705 ../../include/conversation.php:1222
-msgid "Italic"
-msgstr "Itálico "
-
-#: ../../include/ItemObject.php:706 ../../include/conversation.php:1223
-msgid "Underline"
-msgstr "Subrayar"
-
-#: ../../include/ItemObject.php:707 ../../include/conversation.php:1224
-msgid "Quote"
-msgstr "Citar"
-
-#: ../../include/ItemObject.php:708 ../../include/conversation.php:1225
-msgid "Code"
-msgstr "Código"
-
-#: ../../include/ItemObject.php:709
-msgid "Image"
-msgstr "Imagen"
-
-#: ../../include/ItemObject.php:710
-msgid "Insert Link"
-msgstr "Insertar enlace"
-
-#: ../../include/ItemObject.php:711
-msgid "Video"
-msgstr "Vídeo"
+msgid "Visible to anybody on %s."
+msgstr "Visible para cualquiera en %s."
 
-#: ../../include/activities.php:42
-msgid " and "
-msgstr "  y "
+#: ../../include/items.php:1146
+msgid "Visible to all connections."
+msgstr "Visible para todas las conexiones."
 
-#: ../../include/activities.php:50
-msgid "public profile"
-msgstr "el perfil público"
+#: ../../include/items.php:1148
+msgid "Visible to approved connections."
+msgstr "Visible para las conexiones permitidas."
 
-#: ../../include/activities.php:59
-#, php-format
-msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
-msgstr "%1$s ha cambiado %2$s a &ldquo;%3$s&rdquo;"
+#: ../../include/items.php:1150
+msgid "Visible to specific connections."
+msgstr "Visible para conexiones específicas."
 
-#: ../../include/activities.php:60
-#, php-format
-msgid "Visit %1$s's %2$s"
-msgstr "Visitar %2$s de %1$s"
+#: ../../include/items.php:3911
+msgid "Privacy group is empty."
+msgstr "El grupo de canales está vacío."
 
-#: ../../include/activities.php:63
+#: ../../include/items.php:3918
 #, php-format
-msgid "%1$s has an updated %2$s, changing %3$s."
-msgstr "%1$s ha actualizado %2$s, cambiando %3$s."
-
-#: ../../include/follow.php:28
-msgid "Channel is blocked on this site."
-msgstr "El canal está bloqueado en este sitio."
-
-#: ../../include/follow.php:33
-msgid "Channel location missing."
-msgstr "Falta la dirección del canal."
-
-#: ../../include/follow.php:82
-msgid "Response from remote channel was incomplete."
-msgstr "Respuesta incompleta del canal."
-
-#: ../../include/follow.php:99
-msgid "Channel was deleted and no longer exists."
-msgstr "El canal ha sido eliminado y ya no existe."
-
-#: ../../include/follow.php:155 ../../include/follow.php:191
-msgid "Protocol disabled."
-msgstr "Protocolo deshabilitado."
+msgid "Privacy group: %s"
+msgstr "Grupo de canales: %s"
 
-#: ../../include/follow.php:179
-msgid "Channel discovery failed."
-msgstr "El intento de acceder al canal ha fallado."
+#: ../../include/items.php:3930
+msgid "Connection not found."
+msgstr "Conexión no encontrada"
 
-#: ../../include/follow.php:217
-msgid "Cannot connect to yourself."
-msgstr "No puede conectarse consigo mismo."
+#: ../../include/items.php:4279
+msgid "profile photo"
+msgstr "foto del perfil"
 
 #: ../../include/features.php:48
 msgid "General Features"
@@ -8265,10 +8727,6 @@ msgstr "Filtrado de conexiones"
 msgid "Filter incoming posts from connections based on keywords/content"
 msgstr "Filtrar publicaciones entrantes de conexiones por palabras clave o contenido"
 
-#: ../../include/features.php:89 ../../include/apps.php:162
-msgid "Suggest Channels"
-msgstr "Sugerir canales"
-
 #: ../../include/features.php:89
 msgid "Show channel suggestions"
 msgstr "Mostrar sugerencias de canales"
@@ -8321,35 +8779,6 @@ msgstr "Nube de etiquetas"
 msgid "Provide a personal tag cloud on your channel page"
 msgstr "Proveer nube de etiquetas personal en su página de canal"
 
-#: ../../include/message.php:20
-msgid "No recipient provided."
-msgstr "No se ha especificado ningún destinatario."
-
-#: ../../include/message.php:25
-msgid "[no subject]"
-msgstr "[sin asunto]"
-
-#: ../../include/message.php:45
-msgid "Unable to determine sender."
-msgstr "No ha sido posible determinar el remitente. "
-
-#: ../../include/message.php:222
-msgid "Stored post could not be verified."
-msgstr "No se han podido verificar las publicaciones guardadas."
-
-#: ../../include/network.php:659
-msgid "view full size"
-msgstr "Ver en el tamaño original"
-
-#: ../../include/network.php:1879 ../../include/account.php:317
-#: ../../include/account.php:344 ../../include/account.php:404
-msgid "Administrator"
-msgstr "Administrador"
-
-#: ../../include/network.php:1893
-msgid "No Subject"
-msgstr "Sin asunto"
-
 #: ../../include/group.php:26
 msgid ""
 "A deleted group with this name was revived. Existing item permissions "
@@ -8377,672 +8806,307 @@ msgstr "Añadir un grupo de canales"
 msgid "Channels not in any privacy group"
 msgstr "Sin canales en ningún grupo"
 
-#: ../../include/bbcode.php:123 ../../include/bbcode.php:848
-#: ../../include/bbcode.php:851 ../../include/bbcode.php:856
-#: ../../include/bbcode.php:859 ../../include/bbcode.php:862
-#: ../../include/bbcode.php:865 ../../include/bbcode.php:870
-#: ../../include/bbcode.php:873 ../../include/bbcode.php:878
-#: ../../include/bbcode.php:881 ../../include/bbcode.php:884
-#: ../../include/bbcode.php:887
-msgid "Image/photo"
-msgstr "Imagen/foto"
-
-#: ../../include/bbcode.php:162 ../../include/bbcode.php:898
-msgid "Encrypted content"
-msgstr "Contenido cifrado"
-
-#: ../../include/bbcode.php:179
-#, php-format
-msgid "Install %s element: "
-msgstr "Instalar el elemento %s:"
-
-#: ../../include/bbcode.php:183
-#, php-format
-msgid ""
-"This post contains an installable %s element, however you lack permissions "
-"to install it on this site."
-msgstr "Esta entrada contiene el elemento instalable %s, sin embargo le faltan permisos para instalarlo en este sitio."
-
-#: ../../include/bbcode.php:255
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
-msgstr "%1$s escribió %2$s siguiente %3$s"
-
-#: ../../include/bbcode.php:333 ../../include/bbcode.php:341
-msgid "Click to open/close"
-msgstr "Pulsar para abrir/cerrar"
-
-#: ../../include/bbcode.php:341
-msgid "spoiler"
-msgstr "spoiler"
-
-#: ../../include/bbcode.php:586
-msgid "Different viewers will see this text differently"
-msgstr "Visitantes diferentes verán este texto de forma distinta"
-
-#: ../../include/bbcode.php:836
-msgid "$1 wrote:"
-msgstr "$1 escribió:"
-
-#: ../../include/conversation.php:204
-#, php-format
-msgid "%1$s is now connected with %2$s"
-msgstr "%1$s ahora está conectado/a con %2$s"
-
-#: ../../include/conversation.php:239
-#, php-format
-msgid "%1$s poked %2$s"
-msgstr "%1$s ha dado un toque a %2$s"
-
-#: ../../include/conversation.php:243 ../../include/text.php:1021
-#: ../../include/text.php:1026
-msgid "poked"
-msgstr "ha dado un toque a"
-
-#: ../../include/conversation.php:691
-#, php-format
-msgid "View %s's profile @ %s"
-msgstr "Ver el perfil @ %s de %s"
-
-#: ../../include/conversation.php:710
-msgid "Categories:"
-msgstr "Categorías:"
-
-#: ../../include/conversation.php:711
-msgid "Filed under:"
-msgstr "Archivado bajo:"
-
-#: ../../include/conversation.php:738
-msgid "View in context"
-msgstr "Mostrar en su contexto"
-
-#: ../../include/conversation.php:850
-msgid "remove"
-msgstr "eliminar"
-
-#: ../../include/conversation.php:855
-msgid "Delete Selected Items"
-msgstr "Eliminar elementos seleccionados"
-
-#: ../../include/conversation.php:953
-msgid "View Source"
-msgstr "Ver la fuente original de la publicación"
-
-#: ../../include/conversation.php:954
-msgid "Follow Thread"
-msgstr "Seguir este hilo"
-
-#: ../../include/conversation.php:955
-msgid "Unfollow Thread"
-msgstr "Dejar de seguir este hilo"
-
-#: ../../include/conversation.php:960
-msgid "Activity/Posts"
-msgstr "Actividad y publicaciones"
-
-#: ../../include/conversation.php:962
-msgid "Edit Connection"
-msgstr "Editar conexión"
-
-#: ../../include/conversation.php:963
-msgid "Message"
-msgstr "Mensaje"
-
-#: ../../include/conversation.php:1080
-#, php-format
-msgid "%s likes this."
-msgstr "A %s le gusta esto."
-
-#: ../../include/conversation.php:1080
-#, php-format
-msgid "%s doesn't like this."
-msgstr "A %s no le gusta esto."
-
-#: ../../include/conversation.php:1084
-#, 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."
-
-#: ../../include/conversation.php:1086
-#, 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."
-
-#: ../../include/conversation.php:1092
-msgid "and"
-msgstr "y"
-
-#: ../../include/conversation.php:1095
-#, php-format
-msgid ", and %d other people"
-msgid_plural ", and %d other people"
-msgstr[0] ", y %d persona más"
-msgstr[1] ", y %d personas más"
-
-#: ../../include/conversation.php:1096
-#, php-format
-msgid "%s like this."
-msgstr "A %s le gusta esto."
-
-#: ../../include/conversation.php:1096
-#, php-format
-msgid "%s don't like this."
-msgstr "A %s no le gusta esto."
-
-#: ../../include/conversation.php:1136
-msgid "Set your location"
-msgstr "Establecer su ubicación"
-
-#: ../../include/conversation.php:1137
-msgid "Clear browser location"
-msgstr "Eliminar los datos de localización geográfica del navegador"
-
-#: ../../include/conversation.php:1183
-msgid "Tag term:"
-msgstr "Término de la etiqueta:"
-
-#: ../../include/conversation.php:1184
-msgid "Where are you right now?"
-msgstr "¿Donde está ahora?"
-
-#: ../../include/conversation.php:1216
-msgid "Page link name"
-msgstr "Nombre del enlace de la página"
-
-#: ../../include/conversation.php:1219
-msgid "Post as"
-msgstr "Publicar como"
-
-#: ../../include/conversation.php:1229
-msgid "Toggle voting"
-msgstr "Cambiar votación"
-
-#: ../../include/conversation.php:1237
-msgid "Categories (optional, comma-separated list)"
-msgstr "Categorías (opcional, lista separada por comas)"
-
-#: ../../include/conversation.php:1260
-msgid "Set publish date"
-msgstr "Establecer la fecha de publicación"
-
-#: ../../include/conversation.php:1264
-msgid "OK"
-msgstr "OK"
-
-#: ../../include/conversation.php:1509
-msgid "Discover"
-msgstr "Descubrir"
-
-#: ../../include/conversation.php:1512
-msgid "Imported public streams"
-msgstr "Contenidos públicos importados"
-
-#: ../../include/conversation.php:1517
-msgid "Commented Order"
-msgstr "Comentarios recientes"
-
-#: ../../include/conversation.php:1520
-msgid "Sort by Comment Date"
-msgstr "Ordenar por fecha de comentario"
-
-#: ../../include/conversation.php:1524
-msgid "Posted Order"
-msgstr "Publicaciones recientes"
-
-#: ../../include/conversation.php:1527
-msgid "Sort by Post Date"
-msgstr "Ordenar por fecha de publicación"
-
-#: ../../include/conversation.php:1535
-msgid "Posts that mention or involve you"
-msgstr "Publicaciones que le mencionan o involucran"
-
-#: ../../include/conversation.php:1544
-msgid "Activity Stream - by date"
-msgstr "Contenido - por fecha"
-
-#: ../../include/conversation.php:1550
-msgid "Starred"
-msgstr "Preferidas"
-
-#: ../../include/conversation.php:1553
-msgid "Favourite Posts"
-msgstr "Publicaciones favoritas"
-
-#: ../../include/conversation.php:1560
-msgid "Spam"
-msgstr "Correo basura"
-
-#: ../../include/conversation.php:1563
-msgid "Posts flagged as SPAM"
-msgstr "Publicaciones marcadas como basura"
-
-#: ../../include/conversation.php:1620
-msgid "Status Messages and Posts"
-msgstr "Mensajes de estado y publicaciones"
-
-#: ../../include/conversation.php:1629
-msgid "About"
-msgstr "Mi perfil"
-
-#: ../../include/conversation.php:1632
-msgid "Profile Details"
-msgstr "Detalles del perfil"
-
-#: ../../include/conversation.php:1648
-msgid "Files and Storage"
-msgstr "Ficheros y repositorio"
-
-#: ../../include/conversation.php:1685
-msgid "Saved Bookmarks"
-msgstr "Marcadores guardados"
-
-#: ../../include/conversation.php:1695
-msgid "Manage Webpages"
-msgstr "Administrar páginas web"
-
-#: ../../include/conversation.php:1754
-msgctxt "noun"
-msgid "Attending"
-msgid_plural "Attending"
-msgstr[0] "Participaré"
-msgstr[1] "Participaré"
-
-#: ../../include/conversation.php:1757
-msgctxt "noun"
-msgid "Not Attending"
-msgid_plural "Not Attending"
-msgstr[0] "No participaré"
-msgstr[1] "No participaré"
-
-#: ../../include/conversation.php:1760
-msgctxt "noun"
-msgid "Undecided"
-msgid_plural "Undecided"
-msgstr[0] "Indeciso/a"
-msgstr[1] "Indecisos/as"
-
-#: ../../include/conversation.php:1763
-msgctxt "noun"
-msgid "Agree"
-msgid_plural "Agrees"
-msgstr[0] "De acuerdo"
-msgstr[1] "De acuerdo"
-
-#: ../../include/conversation.php:1766
-msgctxt "noun"
-msgid "Disagree"
-msgid_plural "Disagrees"
-msgstr[0] "En desacuerdo"
-msgstr[1] "En desacuerdo"
-
-#: ../../include/conversation.php:1769
-msgctxt "noun"
-msgid "Abstain"
-msgid_plural "Abstains"
-msgstr[0] "se abstiene"
-msgstr[1] "Se abstienen"
-
-#: ../../include/text.php:423
+#: ../../include/text.php:428
 msgid "prev"
 msgstr "anterior"
 
-#: ../../include/text.php:425
+#: ../../include/text.php:430
 msgid "first"
 msgstr "primera"
 
-#: ../../include/text.php:454
+#: ../../include/text.php:459
 msgid "last"
 msgstr "última"
 
-#: ../../include/text.php:457
+#: ../../include/text.php:462
 msgid "next"
 msgstr "próxima"
 
-#: ../../include/text.php:467
+#: ../../include/text.php:472
 msgid "older"
 msgstr "más antiguas"
 
-#: ../../include/text.php:469
+#: ../../include/text.php:474
 msgid "newer"
 msgstr "más recientes"
 
-#: ../../include/text.php:851
+#: ../../include/text.php:863
 msgid "No connections"
 msgstr "Sin conexiones"
 
-#: ../../include/text.php:876
+#: ../../include/text.php:888
 #, php-format
 msgid "View all %s connections"
 msgstr "Ver todas las %s conexiones"
 
-#: ../../include/text.php:1021 ../../include/text.php:1026
+#: ../../include/text.php:1033 ../../include/text.php:1038
 msgid "poke"
 msgstr "un toque"
 
-#: ../../include/text.php:1027
+#: ../../include/text.php:1039
 msgid "ping"
 msgstr "un \"ping\""
 
-#: ../../include/text.php:1027
+#: ../../include/text.php:1039
 msgid "pinged"
 msgstr "ha enviado un \"ping\" a"
 
-#: ../../include/text.php:1028
+#: ../../include/text.php:1040
 msgid "prod"
 msgstr "una incitación "
 
-#: ../../include/text.php:1028
+#: ../../include/text.php:1040
 msgid "prodded"
 msgstr "ha incitado a "
 
-#: ../../include/text.php:1029
+#: ../../include/text.php:1041
 msgid "slap"
 msgstr "una bofetada "
 
-#: ../../include/text.php:1029
+#: ../../include/text.php:1041
 msgid "slapped"
 msgstr "ha abofeteado a "
 
-#: ../../include/text.php:1030
+#: ../../include/text.php:1042
 msgid "finger"
 msgstr "un \"finger\" "
 
-#: ../../include/text.php:1030
+#: ../../include/text.php:1042
 msgid "fingered"
 msgstr "envió un \"finger\" a"
 
-#: ../../include/text.php:1031
+#: ../../include/text.php:1043
 msgid "rebuff"
 msgstr "un reproche"
 
-#: ../../include/text.php:1031
+#: ../../include/text.php:1043
 msgid "rebuffed"
 msgstr "ha hecho un reproche a "
 
-#: ../../include/text.php:1043
+#: ../../include/text.php:1055
 msgid "happy"
 msgstr "feliz "
 
-#: ../../include/text.php:1044
+#: ../../include/text.php:1056
 msgid "sad"
 msgstr "triste "
 
-#: ../../include/text.php:1045
+#: ../../include/text.php:1057
 msgid "mellow"
 msgstr "tranquilo/a"
 
-#: ../../include/text.php:1046
+#: ../../include/text.php:1058
 msgid "tired"
 msgstr "cansado/a "
 
-#: ../../include/text.php:1047
+#: ../../include/text.php:1059
 msgid "perky"
 msgstr "vivaz"
 
-#: ../../include/text.php:1048
+#: ../../include/text.php:1060
 msgid "angry"
 msgstr "enfadado/a"
 
-#: ../../include/text.php:1049
+#: ../../include/text.php:1061
 msgid "stupefied"
 msgstr "asombrado/a"
 
-#: ../../include/text.php:1050
+#: ../../include/text.php:1062
 msgid "puzzled"
 msgstr "perplejo/a"
 
-#: ../../include/text.php:1051
+#: ../../include/text.php:1063
 msgid "interested"
 msgstr "interesado/a"
 
-#: ../../include/text.php:1052
+#: ../../include/text.php:1064
 msgid "bitter"
 msgstr "amargado/a"
 
-#: ../../include/text.php:1053
+#: ../../include/text.php:1065
 msgid "cheerful"
 msgstr "alegre"
 
-#: ../../include/text.php:1054
+#: ../../include/text.php:1066
 msgid "alive"
 msgstr "animado/a"
 
-#: ../../include/text.php:1055
+#: ../../include/text.php:1067
 msgid "annoyed"
 msgstr "molesto/a"
 
-#: ../../include/text.php:1056
+#: ../../include/text.php:1068
 msgid "anxious"
 msgstr "ansioso/a"
 
-#: ../../include/text.php:1057
+#: ../../include/text.php:1069
 msgid "cranky"
 msgstr "de mal humor"
 
-#: ../../include/text.php:1058
+#: ../../include/text.php:1070
 msgid "disturbed"
 msgstr "perturbado/a"
 
-#: ../../include/text.php:1059
+#: ../../include/text.php:1071
 msgid "frustrated"
 msgstr "frustrado/a"
 
-#: ../../include/text.php:1060
+#: ../../include/text.php:1072
 msgid "depressed"
 msgstr "deprimido/a"
 
-#: ../../include/text.php:1061
+#: ../../include/text.php:1073
 msgid "motivated"
 msgstr "motivado/a"
 
-#: ../../include/text.php:1062
+#: ../../include/text.php:1074
 msgid "relaxed"
 msgstr "relajado/a"
 
-#: ../../include/text.php:1063
+#: ../../include/text.php:1075
 msgid "surprised"
 msgstr "sorprendido/a"
 
-#: ../../include/text.php:1235 ../../include/js_strings.php:70
+#: ../../include/text.php:1242 ../../include/js_strings.php:70
 msgid "Monday"
 msgstr "lunes"
 
-#: ../../include/text.php:1235 ../../include/js_strings.php:71
+#: ../../include/text.php:1242 ../../include/js_strings.php:71
 msgid "Tuesday"
 msgstr "martes"
 
-#: ../../include/text.php:1235 ../../include/js_strings.php:72
+#: ../../include/text.php:1242 ../../include/js_strings.php:72
 msgid "Wednesday"
 msgstr "miércoles"
 
-#: ../../include/text.php:1235 ../../include/js_strings.php:73
+#: ../../include/text.php:1242 ../../include/js_strings.php:73
 msgid "Thursday"
 msgstr "jueves"
 
-#: ../../include/text.php:1235 ../../include/js_strings.php:74
+#: ../../include/text.php:1242 ../../include/js_strings.php:74
 msgid "Friday"
 msgstr "viernes"
 
-#: ../../include/text.php:1235 ../../include/js_strings.php:75
+#: ../../include/text.php:1242 ../../include/js_strings.php:75
 msgid "Saturday"
 msgstr "sábado"
 
-#: ../../include/text.php:1235 ../../include/js_strings.php:69
+#: ../../include/text.php:1242 ../../include/js_strings.php:69
 msgid "Sunday"
 msgstr "domingo"
 
-#: ../../include/text.php:1239 ../../include/js_strings.php:45
+#: ../../include/text.php:1246 ../../include/js_strings.php:45
 msgid "January"
 msgstr "enero"
 
-#: ../../include/text.php:1239 ../../include/js_strings.php:46
+#: ../../include/text.php:1246 ../../include/js_strings.php:46
 msgid "February"
 msgstr "febrero"
 
-#: ../../include/text.php:1239 ../../include/js_strings.php:47
+#: ../../include/text.php:1246 ../../include/js_strings.php:47
 msgid "March"
 msgstr "marzo"
 
-#: ../../include/text.php:1239 ../../include/js_strings.php:48
+#: ../../include/text.php:1246 ../../include/js_strings.php:48
 msgid "April"
 msgstr "abril"
 
-#: ../../include/text.php:1239
+#: ../../include/text.php:1246
 msgid "May"
 msgstr "mayo"
 
-#: ../../include/text.php:1239 ../../include/js_strings.php:50
+#: ../../include/text.php:1246 ../../include/js_strings.php:50
 msgid "June"
 msgstr "junio"
 
-#: ../../include/text.php:1239 ../../include/js_strings.php:51
+#: ../../include/text.php:1246 ../../include/js_strings.php:51
 msgid "July"
 msgstr "julio"
 
-#: ../../include/text.php:1239 ../../include/js_strings.php:52
+#: ../../include/text.php:1246 ../../include/js_strings.php:52
 msgid "August"
 msgstr "agosto"
 
-#: ../../include/text.php:1239 ../../include/js_strings.php:53
+#: ../../include/text.php:1246 ../../include/js_strings.php:53
 msgid "September"
 msgstr "septiembre"
 
-#: ../../include/text.php:1239 ../../include/js_strings.php:54
+#: ../../include/text.php:1246 ../../include/js_strings.php:54
 msgid "October"
 msgstr "octubre"
 
-#: ../../include/text.php:1239 ../../include/js_strings.php:55
+#: ../../include/text.php:1246 ../../include/js_strings.php:55
 msgid "November"
 msgstr "noviembre"
 
-#: ../../include/text.php:1239 ../../include/js_strings.php:56
+#: ../../include/text.php:1246 ../../include/js_strings.php:56
 msgid "December"
 msgstr "diciembre"
 
-#: ../../include/text.php:1316 ../../include/text.php:1320
+#: ../../include/text.php:1323 ../../include/text.php:1327
 msgid "Unknown Attachment"
 msgstr "Adjunto no reconocido"
 
-#: ../../include/text.php:1322
+#: ../../include/text.php:1329
 msgid "unknown"
 msgstr "desconocido"
 
-#: ../../include/text.php:1358
+#: ../../include/text.php:1365
 msgid "remove category"
 msgstr "eliminar categoría"
 
-#: ../../include/text.php:1435
+#: ../../include/text.php:1442
 msgid "remove from file"
 msgstr "eliminar del fichero"
 
-#: ../../include/text.php:1764 ../../include/text.php:1836
+#: ../../include/text.php:1738 ../../include/text.php:1809
 msgid "default"
 msgstr "por defecto"
 
-#: ../../include/text.php:1772
+#: ../../include/text.php:1746
 msgid "Page layout"
 msgstr "Plantilla de la página"
 
-#: ../../include/text.php:1772
+#: ../../include/text.php:1746
 msgid "You can create your own with the layouts tool"
 msgstr "Puede crear su propia disposición gráfica con la herramienta de plantillas"
 
-#: ../../include/text.php:1814
+#: ../../include/text.php:1788
 msgid "Page content type"
 msgstr "Tipo de contenido de la página"
 
-#: ../../include/text.php:1848
+#: ../../include/text.php:1821
 msgid "Select an alternate language"
 msgstr "Seleccionar un idioma alternativo"
 
-#: ../../include/text.php:1965
+#: ../../include/text.php:1938
 msgid "activity"
 msgstr "la actividad"
 
-#: ../../include/text.php:2274
+#: ../../include/text.php:2247
 msgid "Design Tools"
 msgstr "Herramientas de diseño web"
 
-#: ../../include/text.php:2280
+#: ../../include/text.php:2253
 msgid "Pages"
 msgstr "Páginas"
 
-#: ../../include/account.php:28
-msgid "Not a valid email address"
-msgstr "Dirección de correo no válida"
-
-#: ../../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: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:68
-msgid "An invitation is required."
-msgstr "Es obligatorio que le inviten."
-
-#: ../../include/account.php:72
-msgid "Invitation could not be verified."
-msgstr "No se ha podido verificar su invitación."
-
-#: ../../include/account.php:122
-msgid "Please enter the required information."
-msgstr "Por favor introduzca la información requerida."
-
-#: ../../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:249
-#, php-format
-msgid "Registration confirmation for %s"
-msgstr "Confirmación de registro para %s"
-
-#: ../../include/account.php:315
-#, php-format
-msgid "Registration request at %s"
-msgstr "Solicitud de registro en %s"
-
-#: ../../include/account.php:339
-msgid "your registration password"
-msgstr "su contraseña de registro"
-
-#: ../../include/account.php:342 ../../include/account.php:402
-#, php-format
-msgid "Registration details for %s"
-msgstr "Detalles del registro de %s"
+#: ../../include/zot.php:699
+msgid "Invalid data packet"
+msgstr "Paquete de datos no válido"
 
-#: ../../include/account.php:414
-msgid "Account approved."
-msgstr "Cuenta aprobada."
+#: ../../include/zot.php:715
+msgid "Unable to verify channel signature"
+msgstr "No ha sido posible de verificar la firma del canal"
 
-#: ../../include/account.php:454
+#: ../../include/zot.php:2363
 #, php-format
-msgid "Registration revoked for %s"
-msgstr "Registro revocado para %s"
-
-#: ../../include/account.php:506
-msgid "Account verified. Please login."
-msgstr "Cuenta verificada. Por favor, inicie sesión."
-
-#: ../../include/account.php:722 ../../include/account.php:724
-msgid "Click here to upgrade."
-msgstr "Pulse aquí para actualizar"
-
-#: ../../include/account.php:730
-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 "
+msgid "Unable to verify site signature for %s"
+msgstr "No ha sido posible de verificar la firma del sitio para %s"
 
-#: ../../include/account.php:735
-msgid "This action is not available under your subscription plan."
-msgstr "Esta acción no está disponible en su plan de suscripción."
+#: ../../include/zot.php:3712
+msgid "invalid target signature"
+msgstr "La firma recibida no es válida"
 
 #: ../../include/taxonomy.php:228 ../../include/taxonomy.php:249
 msgid "Tags"
@@ -9076,69 +9140,6 @@ msgstr "gusta de"
 msgid "dislikes"
 msgstr "no gusta de"
 
-#: ../../include/PermissionDescription.php:31
-#: ../../include/acl_selectors.php:236
-msgid "Visible to your default audience"
-msgstr "Visible para su público predeterminado."
-
-#: ../../include/PermissionDescription.php:115
-#: ../../include/acl_selectors.php:272
-msgid "Only me"
-msgstr "Sólo yo"
-
-#: ../../include/PermissionDescription.php:116
-msgid "Public"
-msgstr "Público"
-
-#: ../../include/PermissionDescription.php:117
-msgid "Anybody in the $Projectname network"
-msgstr "Cualquiera en la red $Projectname"
-
-#: ../../include/PermissionDescription.php:118
-#, php-format
-msgid "Any account on %s"
-msgstr "Cualquier cuenta en %s"
-
-#: ../../include/PermissionDescription.php:119
-msgid "Any of my connections"
-msgstr "Cualquiera de mis conexiones"
-
-#: ../../include/PermissionDescription.php:120
-msgid "Only connections I specifically allow"
-msgstr "Sólo las conexiones que yo permita de forma explícita"
-
-#: ../../include/PermissionDescription.php:121
-msgid "Anybody authenticated (could include visitors from other networks)"
-msgstr "Cualquiera que se haya autenticado (podría incluir a los visitantes de otras redes)"
-
-#: ../../include/PermissionDescription.php:122
-msgid "Any connections including those who haven't yet been approved"
-msgstr "Cualquier conexión incluyendo aquellas que aún no han sido aprobadas"
-
-#: ../../include/PermissionDescription.php:161
-msgid ""
-"This is your default setting for the audience of your normal stream, and "
-"posts."
-msgstr "Esta es la configuración predeterminada para su flujo (stream) habitual de publicaciones."
-
-#: ../../include/PermissionDescription.php:162
-msgid ""
-"This is your default setting for who can view your default channel profile"
-msgstr "Esta es su configuración por defecto para establecer quién puede ver su perfil del canal predeterminado"
-
-#: ../../include/PermissionDescription.php:163
-msgid "This is your default setting for who can view your connections"
-msgstr "Este es su ajuste predeterminado para establecer quién puede ver sus conexiones"
-
-#: ../../include/PermissionDescription.php:164
-msgid ""
-"This is your default setting for who can view your file storage and photos"
-msgstr "Este es su ajuste predeterminado para establecer quién puede ver su repositorio de ficheros y sus fotos"
-
-#: ../../include/PermissionDescription.php:165
-msgid "This is your default setting for the audience of your webpages"
-msgstr "Este es el ajuste predeterminado para establecer la audiencia de sus páginas web"
-
 #: ../../include/js_strings.php:5
 msgid "Delete this item?"
 msgstr "¿Borrar este elemento?"
@@ -9383,68 +9384,97 @@ msgctxt "calendar"
 msgid "All day"
 msgstr "Todos los días"
 
-#: ../../include/import.php:27
-msgid ""
-"Cannot create a duplicate channel identifier on this system. Import failed."
-msgstr "No se ha podido crear un canal con un identificador que ya existe en este sistema. La importación ha fallado."
+#: ../../include/PermissionDescription.php:116
+msgid "Public"
+msgstr "Público"
 
-#: ../../include/import.php:74
-msgid "Channel clone failed. Import failed."
-msgstr "La clonación del canal no ha salido bien. La importación ha fallado."
+#: ../../include/PermissionDescription.php:117
+msgid "Anybody in the $Projectname network"
+msgstr "Cualquiera en la red $Projectname"
 
-#: ../../include/items.php:890 ../../include/items.php:935
-msgid "(Unknown)"
-msgstr "(Desconocido)"
+#: ../../include/PermissionDescription.php:118
+#, php-format
+msgid "Any account on %s"
+msgstr "Cualquier cuenta en %s"
 
-#: ../../include/items.php:1134
-msgid "Visible to anybody on the internet."
-msgstr "Visible para cualquiera en internet."
+#: ../../include/PermissionDescription.php:119
+msgid "Any of my connections"
+msgstr "Cualquiera de mis conexiones"
 
-#: ../../include/items.php:1136
-msgid "Visible to you only."
-msgstr "Visible sólo para usted."
+#: ../../include/PermissionDescription.php:120
+msgid "Only connections I specifically allow"
+msgstr "Sólo las conexiones que yo permita de forma explícita"
 
-#: ../../include/items.php:1138
-msgid "Visible to anybody in this network."
-msgstr "Visible para cualquiera en esta red."
+#: ../../include/PermissionDescription.php:121
+msgid "Anybody authenticated (could include visitors from other networks)"
+msgstr "Cualquiera que esté autenticado (podría incluir a los visitantes de otras redes)"
 
-#: ../../include/items.php:1140
-msgid "Visible to anybody authenticated."
-msgstr "Visible para cualquiera que haya sido autenticado."
+#: ../../include/PermissionDescription.php:122
+msgid "Any connections including those who haven't yet been approved"
+msgstr "Cualquier conexión incluyendo aquellas que aún no han sido aprobadas"
 
-#: ../../include/items.php:1142
-#, php-format
-msgid "Visible to anybody on %s."
-msgstr "Visible para cualquiera en %s."
+#: ../../include/PermissionDescription.php:161
+msgid ""
+"This is your default setting for the audience of your normal stream, and "
+"posts."
+msgstr "Esta es la configuración predeterminada para su flujo (stream) habitual de publicaciones."
 
-#: ../../include/items.php:1144
-msgid "Visible to all connections."
-msgstr "Visible para todas las conexiones."
+#: ../../include/PermissionDescription.php:162
+msgid ""
+"This is your default setting for who can view your default channel profile"
+msgstr "Esta es su configuración por defecto para establecer quién puede ver su perfil del canal predeterminado"
 
-#: ../../include/items.php:1146
-msgid "Visible to approved connections."
-msgstr "Visible para las conexiones permitidas."
+#: ../../include/PermissionDescription.php:163
+msgid "This is your default setting for who can view your connections"
+msgstr "Este es su ajuste predeterminado para establecer quién puede ver sus conexiones"
 
-#: ../../include/items.php:1148
-msgid "Visible to specific connections."
-msgstr "Visible para conexiones específicas."
+#: ../../include/PermissionDescription.php:164
+msgid ""
+"This is your default setting for who can view your file storage and photos"
+msgstr "Este es su ajuste predeterminado para establecer quién puede ver su repositorio de ficheros y sus fotos"
 
-#: ../../include/items.php:3910
-msgid "Privacy group is empty."
-msgstr "El grupo de canales está vacío."
+#: ../../include/PermissionDescription.php:165
+msgid "This is your default setting for the audience of your webpages"
+msgstr "Este es el ajuste predeterminado para establecer la audiencia de sus páginas web"
+
+#: ../../include/activities.php:41
+msgid " and "
+msgstr "  y "
+
+#: ../../include/activities.php:49
+msgid "public profile"
+msgstr "el perfil público"
 
-#: ../../include/items.php:3917
+#: ../../include/activities.php:58
 #, php-format
-msgid "Privacy group: %s"
-msgstr "Grupo de canales: %s"
+msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
+msgstr "%1$s ha cambiado %2$s a &ldquo;%3$s&rdquo;"
 
-#: ../../include/items.php:3929
-msgid "Connection not found."
-msgstr "Conexión no encontrada"
+#: ../../include/activities.php:59
+#, php-format
+msgid "Visit %1$s's %2$s"
+msgstr "Visitar %2$s de %1$s"
 
-#: ../../include/items.php:4278
-msgid "profile photo"
-msgstr "foto del perfil"
+#: ../../include/activities.php:62
+#, php-format
+msgid "%1$s has an updated %2$s, changing %3$s."
+msgstr "%1$s ha actualizado %2$s, cambiando %3$s."
+
+#: ../../include/dir_fns.php:141
+msgid "Directory Options"
+msgstr "Opciones del directorio"
+
+#: ../../include/dir_fns.php:143
+msgid "Safe Mode"
+msgstr "Modo seguro"
+
+#: ../../include/dir_fns.php:144
+msgid "Public Forums Only"
+msgstr "Solo foros públicos"
+
+#: ../../include/dir_fns.php:145
+msgid "This Website Only"
+msgstr "Solo este sitio web"
 
 #: ../../include/page_widgets.php:6
 msgid "New Page"
@@ -9595,99 +9625,14 @@ msgstr "Especial - Repositorio de grupo"
 msgid "Custom/Expert Mode"
 msgstr "Modo personalizado/experto"
 
-#: ../../include/apps.php:155
-msgid "Site Admin"
-msgstr "Administrador del sitio"
-
-#: ../../include/apps.php:156
-msgid "Bug Report"
-msgstr "Informe de errores"
-
-#: ../../include/apps.php:157
-msgid "View Bookmarks"
-msgstr "Ver los marcadores"
-
-#: ../../include/apps.php:158
-msgid "My Chatrooms"
-msgstr "Mis salas de chat"
-
-#: ../../include/apps.php:160
-msgid "Firefox Share"
-msgstr "Servicio de compartición de Firefox"
-
-#: ../../include/apps.php:161
-msgid "Remote Diagnostics"
-msgstr "Diagnóstico remoto"
-
-#: ../../include/apps.php:180
-msgid "Probe"
-msgstr "Probar"
-
-#: ../../include/apps.php:181
-msgid "Suggest"
-msgstr "Sugerir"
-
-#: ../../include/apps.php:182
-msgid "Random Channel"
-msgstr "Canal aleatorio"
-
-#: ../../include/apps.php:183
-msgid "Invite"
-msgstr "Invitar"
-
-#: ../../include/apps.php:186
-msgid "Post"
-msgstr "Publicación"
-
-#: ../../include/apps.php:289
-msgid "Purchase"
-msgstr "Comprar"
-
 #: ../../include/bb2diaspora.php:398
 msgid "Attachments:"
 msgstr "Ficheros adjuntos:"
 
-#: ../../include/bb2diaspora.php:489
+#: ../../include/bb2diaspora.php:487
 msgid "$Projectname event notification:"
 msgstr "Notificación de eventos de $Projectname:"
 
-#: ../../include/acl_selectors.php:273
-msgid "Add others"
-msgstr "Añadir otros"
-
-#: ../../include/acl_selectors.php:276
-msgid "Who can see this?"
-msgstr "¿Quién puede ver esto?"
-
-#: ../../include/acl_selectors.php:277
-msgid "Custom selection"
-msgstr "Selección personalizada"
-
-#: ../../include/acl_selectors.php:278
-msgid ""
-"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit"
-" the scope of \"Show\"."
-msgstr "Seleccione \"Mostrar\" para permitir la visualización. La opción \"No mostrar\" le permite anular y limitar el alcance de \"Mostrar\"."
-
-#: ../../include/acl_selectors.php:279
-msgid "Show"
-msgstr "Mostrar"
-
-#: ../../include/acl_selectors.php:280
-msgid "Don't show"
-msgstr "No mostrar"
-
-#: ../../include/acl_selectors.php:286
-msgid "Other networks and post services"
-msgstr "Otras redes y servicios de publicación"
-
-#: ../../include/acl_selectors.php:316
-#, php-format
-msgid ""
-"Post permissions %s cannot be changed %s after a post is shared.</br />These"
-" permissions set who is allowed to view the post."
-msgstr "Los permisos de la entrada %s no se pueden cambiar %s una vez que se ha compartido.</br /> Estos permisos establecen quién está autorizado para ver el mensaje."
-
 #: ../../view/theme/redbasic/php/config.php:82
 msgid "Focus (Hubzilla default)"
 msgstr "Focus (predefinido)"
@@ -9824,62 +9769,62 @@ msgstr "Ajustar el tamaño de la foto del autor de la conversación"
 msgid "Set size of followup author photos"
 msgstr "Ajustar el tamaño de foto de los seguidores del autor"
 
-#: ../../boot.php:1089
+#: ../../boot.php:1161
 #, php-format
 msgctxt "opensearch"
 msgid "Search %1$s (%2$s)"
 msgstr "Buscar %1$s (%2$s)"
 
-#: ../../boot.php:1089
+#: ../../boot.php:1161
 msgctxt "opensearch"
 msgid "$Projectname"
 msgstr "$Projectname"
 
-#: ../../boot.php:1406
+#: ../../boot.php:1473
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "La actualización %s ha fallado. Mire el informe de errores."
 
-#: ../../boot.php:1409
+#: ../../boot.php:1476
 #, php-format
 msgid "Update Error at %s"
 msgstr "Error de actualización en %s"
 
-#: ../../boot.php:1610
+#: ../../boot.php:1676
 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:1632
+#: ../../boot.php:1698
 msgid "Password"
 msgstr "Contraseña"
 
-#: ../../boot.php:1633
+#: ../../boot.php:1699
 msgid "Remember me"
 msgstr "Recordarme"
 
-#: ../../boot.php:1636
+#: ../../boot.php:1702
 msgid "Forgot your password?"
 msgstr "¿Olvidó su contraseña?"
 
-#: ../../boot.php:2205
+#: ../../boot.php:2268
 msgid "toggle mobile"
 msgstr "cambiar a modo móvil"
 
-#: ../../boot.php:2358
+#: ../../boot.php:2417
 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:2361
+#: ../../boot.php:2420
 #, php-format
 msgid "[hubzilla] Website SSL error for %s"
 msgstr "[hubzilla] Error SSL del sitio web en %s"
 
-#: ../../boot.php:2398
+#: ../../boot.php:2461
 msgid "Cron/Scheduled tasks not running."
 msgstr "Las tareas del Planificador/Cron no están funcionando."
 
-#: ../../boot.php:2402
+#: ../../boot.php:2465
 #, php-format
 msgid "[hubzilla] Cron tasks not running on %s"
 msgstr "[hubzilla] Las tareas de Cron no están funcionando en %s"
diff --git a/view/es-es/hstrings.php b/view/es-es/hstrings.php
index f2f79b2e9..feb53f07c 100644
--- a/view/es-es/hstrings.php
+++ b/view/es-es/hstrings.php
@@ -32,6 +32,7 @@ App::$strings["Upload file"] = "Subir fichero";
 App::$strings["Permission denied."] = "Acceso denegado.";
 App::$strings["Not Found"] = "No encontrado";
 App::$strings["Page not found."] = "Página no encontrada.";
+App::$strings["Permission denied"] = "Permiso denegado";
 App::$strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "La autenticación desde su servidor está bloqueada. Ha iniciado sesión localmente. Por favor, salga de la sesión y vuelva a intentarlo.";
 App::$strings["Welcome %s. Remote authentication successful."] = "Bienvenido %s. La identificación desde su servidor se ha llevado a cabo correctamente.";
 App::$strings["Requested profile is not available."] = "El perfil solicitado no está disponible.";
@@ -143,7 +144,7 @@ App::$strings["for channel"] = "por canal";
 App::$strings["on server"] = "en el servidor";
 App::$strings["Status"] = "Estado";
 App::$strings["Server"] = "Servidor";
-App::$strings["By default, unfiltered HTML is allowed in embedded media. This is inherently insecure."] = "De forma predeterminada, el HTML sin filtrar está permitido en los medios incorporados en una publicación. Esto es siempre inseguro.";
+App::$strings["By default, unfiltered HTML is allowed in embedded media. This is inherently insecure."] = "De forma predeterminada, el HTML sin filtrar está permitido en el contenido multimedia incorporado en una publicación. Esto es siempre inseguro.";
 App::$strings["The recommended setting is to only allow unfiltered HTML from the following sites:"] = "La configuración recomendada es que sólo se permita HTML sin filtrar desde los siguientes sitios: ";
 App::$strings["https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/<br />https://vimeo.com/<br />https://soundcloud.com/<br />"] = "https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/<br />https://vimeo.com/<br />https://soundcloud.com/<br />";
 App::$strings["All other embedded content will be filtered, <strong>unless</strong> embedded content from that site is explicitly blocked."] = "El resto del contenido incrustado se filtrará, <strong>excepto</ strong> si el contenido incorporado desde ese sitio está bloqueado de forma explícita.";
@@ -158,7 +159,7 @@ App::$strings["Block communications from these sites"] = "Bloquear la comunicaci
 App::$strings["Allow communications only from these channels"] = "Permitir la comunicación solo desde estos canales";
 App::$strings["One channel (hash) per line. Leave empty to allow from any channel by default"] = "Un canal (hash) por línea. Dejar en blanco para permitir por defecto la comunicación desde cualquiera";
 App::$strings["Block communications from these channels"] = "Bloquear la comunicación desde estos canales";
-App::$strings["Only allow embeds from secure (SSL) websites and links."] = "Sólo se permite contenido incorporado desde sitios y enlaces seguros (SSL).";
+App::$strings["Only allow embeds from secure (SSL) websites and links."] = "Sólo se permite contenido multimedia incorporado desde sitios y enlaces seguros (SSL).";
 App::$strings["Allow unfiltered embedded HTML content only from these domains"] = "Permitir contenido HTML sin filtrar sólo desde estos dominios ";
 App::$strings["One site per line. By default embedded content is filtered."] = "Un sitio por línea. El contenido incorporado se filtra de forma predeterminada.";
 App::$strings["Block embedded HTML from these domains"] = "Bloquear contenido con HTML incorporado desde estos dominios";
@@ -522,7 +523,6 @@ App::$strings["Oldest to Newest"] = "De más antiguo a más nuevo";
 App::$strings["No entries (some entries may be hidden)."] = "Sin entradas (algunas entradas pueden estar ocultas).";
 App::$strings["This site is not a directory server"] = "Este sitio no es un servidor de directorio";
 App::$strings["This directory server requires an access token"] = "El servidor de este directorio necesita un \"token\" de acceso";
-App::$strings["Permission denied"] = "Permiso denegado";
 App::$strings["Invalid message"] = "Mensaje no válido";
 App::$strings["no results"] = "sin resultados";
 App::$strings["Delivery report for %1\$s"] = "Informe de entrega para %1\$s";
@@ -595,10 +595,6 @@ App::$strings["Share this file"] = "Compartir este fichero";
 App::$strings["Show URL to this file"] = "Mostrar la dirección de este fichero";
 App::$strings["Notify your contacts about this file"] = "Avisar a sus contactos sobre este fichero";
 App::$strings["Channel added."] = "Canal añadido.";
-App::$strings["Contact not found."] = "Contacto no encontrado";
-App::$strings["Friend suggestion sent."] = "Enviar sugerencia a un amigo.";
-App::$strings["Suggest Friends"] = "Sugerir amigos";
-App::$strings["Suggest a friend for %s"] = "Sugerir un amigo a %s";
 App::$strings["Privacy group created."] = "El grupo de canales ha sido creado.";
 App::$strings["Could not create privacy group."] = "No se puede crear el grupo de canales";
 App::$strings["Privacy group not found."] = "Grupo de canales no encontrado.";
@@ -1036,6 +1032,7 @@ App::$strings["The listed hubs allow public registration for the \$Projectname n
 App::$strings["Hub URL"] = "Dirección del hub";
 App::$strings["Access Type"] = "Tipo de acceso";
 App::$strings["Registration Policy"] = "Normas de registro";
+App::$strings["Stats"] = "Estadísticas";
 App::$strings["Software"] = "Software";
 App::$strings["Ratings"] = "Valoraciones";
 App::$strings["Rate"] = "Valorar";
@@ -1273,7 +1270,7 @@ App::$strings["Please select a default timezone for your website"] = "Por favor,
 App::$strings["Site settings"] = "Ajustes del sitio";
 App::$strings["Enable \$Projectname <strong>advanced</strong> features?"] = "¿Habilitar las funcionalidades <strong>avanzadas</strong> de \$Projectname ?";
 App::$strings["Some advanced features, while useful - may be best suited for technically proficient audiences"] = "Algunas funcionalidades avanzadas, si bien son útiles, pueden ser más adecuadas para un público técnicamente competente";
-App::$strings["PHP version 5.4 or greater is required."] = "Se requiere la versión 5.4, o superior, de PHP.";
+App::$strings["PHP version 5.5 or greater is required."] = "Se requiere la versión 5.5, o superior, de PHP.";
 App::$strings["PHP version"] = "Versión de PHP";
 App::$strings["Could not find a command line version of PHP in the web server PATH."] = "No se puede encontrar una versión en línea de comandos de PHP en la ruta del servidor web.";
 App::$strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron."] = "Si no tiene instalada la versión de línea de comandos de PHP en su servidor, no podrá realizar envíos en segundo plano mediante cron.";
@@ -1313,7 +1310,7 @@ App::$strings["At the end of this procedure, we will give you a text to save in
 App::$strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions."] = "Como alternativa, puede dejar este procedimiento e intentar realizar una instalación manual. Lea, por favor, el fichero\"install/INSTALL.txt\" para las instrucciones.";
 App::$strings[".htconfig.php is writable"] = ".htconfig.php tiene permisos de escritura";
 App::$strings["Red uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Hubzilla hace uso del motor de plantillas Smarty3 para diseñar sus plantillas gráficas. Smarty3 es más rápido porque compila las plantillas de páginas directamente en PHP.";
-App::$strings["In order to store these compiled templates, the web server needs to have write access to the directory %s under the Red top level folder."] = "Para poder guardar las plantillas compiladas, el servidor web necesita permisos para acceder al subdirectorio %s en el directorio de instalación de Hubzilla.";
+App::$strings["In order to store these compiled templates, the web server needs to have write access to the directory %s under the top level web folder."] = "Para poder guardar las plantillas compiladas, el servidor web necesita permisos para acceder al directorio %s en la carpeta web principal.";
 App::$strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Por favor, asegúrese de que el servidor web está siendo ejecutado por un usuario que tenga permisos de escritura sobre esta carpeta (por ejemplo, www-data).";
 App::$strings["Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains."] = "Nota: como medida de seguridad, debe dar al servidor web permisos de escritura solo sobre %s - no sobre el fichero de plantilla (.tpl) que contiene.";
 App::$strings["%s is writable"] = "%s tiene permisos de escritura";
@@ -1409,14 +1406,272 @@ App::$strings["Page Link"] = "Vínculo de la página";
 App::$strings["Page Title"] = "Título de página";
 App::$strings["Xchan Lookup"] = "Búsqueda de canales";
 App::$strings["Lookup xchan beginning with (or webbie): "] = "Buscar un canal (o un \"webbie\") que comience por:";
+App::$strings["Site Admin"] = "Administrador del sitio";
+App::$strings["Bug Report"] = "Informe de errores";
+App::$strings["View Bookmarks"] = "Ver los marcadores";
+App::$strings["My Chatrooms"] = "Mis salas de chat";
+App::$strings["Firefox Share"] = "Servicio de compartición de Firefox";
+App::$strings["Remote Diagnostics"] = "Diagnóstico remoto";
+App::$strings["Suggest Channels"] = "Sugerir canales";
+App::$strings["Login"] = "Iniciar sesión";
+App::$strings["Grid"] = "Red";
+App::$strings["Channel Home"] = "Mi canal";
+App::$strings["Events"] = "Eventos";
+App::$strings["Directory"] = "Directorio";
+App::$strings["Mail"] = "Correo";
+App::$strings["Chat"] = "Chat";
+App::$strings["Probe"] = "Probar";
+App::$strings["Suggest"] = "Sugerir";
+App::$strings["Random Channel"] = "Canal aleatorio";
+App::$strings["Invite"] = "Invitar";
+App::$strings["Features"] = "Funcionalidades";
+App::$strings["Post"] = "Publicación";
+App::$strings["Purchase"] = "Comprar";
+App::$strings["Missing room name"] = "Sala de chat sin nombre";
+App::$strings["Duplicate room name"] = "Nombre de sala duplicado.";
+App::$strings["Invalid room specifier."] = "Especificador de sala no válido.";
+App::$strings["Room not found."] = "Sala no encontrada.";
+App::$strings["Room is full"] = "La sala está llena.";
+App::$strings["Private Message"] = "Mensaje Privado";
+App::$strings["Select"] = "Seleccionar";
+App::$strings["Save to Folder"] = "Guardar en carpeta";
+App::$strings["I will attend"] = "Participaré";
+App::$strings["I will not attend"] = "No participaré";
+App::$strings["I might attend"] = "Quizá participe";
+App::$strings["I agree"] = "Estoy de acuerdo";
+App::$strings["I disagree"] = "No estoy de acuerdo";
+App::$strings["I abstain"] = "Me abstengo";
+App::$strings["Add Star"] = "Destacar añadiendo una estrella";
+App::$strings["Remove Star"] = "Eliminar estrella";
+App::$strings["Toggle Star Status"] = "Activar o desactivar el estado de entrada preferida";
+App::$strings["starred"] = "preferidas";
+App::$strings["Message signature validated"] = "Firma de mensaje validada";
+App::$strings["Message signature incorrect"] = "Firma de mensaje incorrecta";
+App::$strings["Add Tag"] = "Añadir etiqueta";
+App::$strings["like"] = "me gusta";
+App::$strings["dislike"] = "no me gusta";
+App::$strings["Share This"] = "Compartir esto";
+App::$strings["share"] = "compartir";
+App::$strings["Delivery Report"] = "Informe de transmisión";
+App::$strings["%d comment"] = array(
+	0 => "%d comentario",
+	1 => "%d comentarios",
+);
+App::$strings["View %s's profile - %s"] = "Ver el perfil de %s - %s";
+App::$strings["to"] = "a";
+App::$strings["via"] = "mediante";
+App::$strings["Wall-to-Wall"] = "De página del perfil a página del perfil (de \"muro\" a \"muro\")";
+App::$strings["via Wall-To-Wall:"] = "Mediante el procedimiento página del perfil a página del perfil (de \"muro\" a \"muro\")";
+App::$strings["from %s"] = "desde %s";
+App::$strings["last edited: %s"] = "último cambio: %s";
+App::$strings["Expires: %s"] = "Caduca: %s";
+App::$strings["Save Bookmarks"] = "Guardar en Marcadores";
+App::$strings["Add to Calendar"] = "Añadir al calendario";
+App::$strings["Mark all seen"] = "Marcar todo como visto";
+App::$strings["[+] show all"] = "[+] mostrar todo:";
+App::$strings["Bold"] = "Negrita";
+App::$strings["Italic"] = "Itálico ";
+App::$strings["Underline"] = "Subrayar";
+App::$strings["Quote"] = "Citar";
+App::$strings["Code"] = "Código";
+App::$strings["Image"] = "Imagen";
+App::$strings["Insert Link"] = "Insertar enlace";
+App::$strings["Video"] = "Vídeo";
+App::$strings["\$Projectname Notification"] = "Notificación de \$Projectname";
+App::$strings["\$projectname"] = "\$projectname";
+App::$strings["Thank You,"] = "Gracias,";
+App::$strings["%s Administrator"] = "%s Administrador";
+App::$strings["%s <!item_type!>"] = "%s <!item_type!>";
+App::$strings["[Hubzilla:Notify] New mail received at %s"] = "[Hubzilla:Aviso] Nuevo mensaje en %s";
+App::$strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s le ha enviado un nuevo mensaje privado en %3\$s.";
+App::$strings["%1\$s sent you %2\$s."] = "%1\$s le ha enviado %2\$s.";
+App::$strings["a private message"] = "un mensaje privado";
+App::$strings["Please visit %s to view and/or reply to your private messages."] = "Por favor visite %s para ver y/o responder a su mensaje privado.";
+App::$strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s ha comentado [zrl=%3\$s]%4\$s[/zrl]";
+App::$strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s ha comentado [zrl=%3\$s]%5\$s de %4\$s[/zrl] ";
+App::$strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s ha comentado [zrl=%3\$s]%4\$s creado por usted[/zrl]";
+App::$strings["[Hubzilla:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Hubzilla:Aviso] Nuevo comentario de %2\$s a la conversación #%1\$d";
+App::$strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s ha comentado un elemento/conversación que ha estado siguiendo.";
+App::$strings["Please visit %s to view and/or reply to the conversation."] = "Para ver o comentar la conversación, visite %s";
+App::$strings["[Hubzilla:Notify] %s posted to your profile wall"] = "[Hubzilla:Aviso] %s ha publicado una entrada en su página de inicio del perfil (\"muro\")";
+App::$strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = "%1\$s, %2\$s ha publicado en su página del perfil en %3\$s";
+App::$strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = "%1\$s, %2\$s ha publicado en [zrl=%3\$s]su página del perfil[/zrl]";
+App::$strings["[Hubzilla:Notify] %s tagged you"] = "[Hubzilla:Aviso] %s le ha etiquetado";
+App::$strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, %2\$s le ha etiquetado en %3\$s";
+App::$strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "%1\$s, %2\$s [zrl=%3\$s]le etiquetó[/zrl].";
+App::$strings["[Hubzilla:Notify] %1\$s poked you"] = "[Hubzilla:Aviso] %1\$s le ha dado un toque";
+App::$strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s le ha dado un toque en %3\$s";
+App::$strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s, %2\$s [zrl=%2\$s]le ha dado un toque[/zrl].";
+App::$strings["[Hubzilla:Notify] %s tagged your post"] = "[Hubzilla:Aviso] %s ha etiquetado su publicación";
+App::$strings["%1\$s, %2\$s tagged your post at %3\$s"] = "%1\$s, %2\$s ha etiquetado su publicación en %3\$s";
+App::$strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "%1\$s, %2\$s ha etiquetado [zrl=%3\$s]su publicación[/zrl]";
+App::$strings["[Hubzilla:Notify] Introduction received"] = "[Hubzilla:Aviso] Ha recibido una solicitud de conexión";
+App::$strings["%1\$s, you've received an new connection request from '%2\$s' at %3\$s"] = "%1\$s, ha recibido una nueva solicitud de conexión de '%2\$s' en  %3\$s";
+App::$strings["%1\$s, you've received [zrl=%2\$s]a new connection request[/zrl] from %3\$s."] = "%1\$s, ha recibido [zrl=%2\$s]una nueva solicitud de conexión[/zrl] de %3\$s.";
+App::$strings["You may visit their profile at %s"] = "Puede visitar su perfil en %s";
+App::$strings["Please visit %s to approve or reject the connection request."] = "Por favor, visite %s para permitir o rechazar la solicitad de conexión.";
+App::$strings["[Hubzilla:Notify] Friend suggestion received"] = "[Hubzilla:Aviso] Ha recibido una sugerencia de amistad";
+App::$strings["%1\$s, you've received a friend suggestion from '%2\$s' at %3\$s"] = "%1\$s, ha recibido una sugerencia de conexión de '%2\$s' en %3\$s";
+App::$strings["%1\$s, you've received [zrl=%2\$s]a friend suggestion[/zrl] for %3\$s from %4\$s."] = "%1\$s, ha recibido [zrl=%2\$s]una sugerencia de conexión[/zrl] para %3\$s de %4\$s.";
+App::$strings["Name:"] = "Nombre:";
+App::$strings["Photo:"] = "Foto:";
+App::$strings["Please visit %s to approve or reject the suggestion."] = "Por favor, visite %s para aprobar o rechazar la sugerencia.";
+App::$strings["[Hubzilla:Notify]"] = "[Hubzilla:Aviso]";
+App::$strings["created a new post"] = "ha creado una nueva entrada";
+App::$strings["commented on %s's post"] = "ha comentado la entrada de %s";
 App::$strings["No username found in import file."] = "No se ha encontrado el nombre de usuario en el fichero importado.";
 App::$strings["Unable to create a unique channel address. Import failed."] = "No se ha podido crear una dirección de canal única. Ha fallado la importación.";
 App::$strings["Cannot locate DNS info for database server '%s'"] = "No se ha podido localizar información de DNS para el servidor de base de datos “%s”";
-App::$strings["Public Timeline"] = "Cronología pública";
-App::$strings["created a new post"] = "ha creado una nueva entrada";
-App::$strings["commented on %s's post"] = "ha comentado la entrada de %s";
+App::$strings["view full size"] = "Ver en el tamaño original";
+App::$strings["Administrator"] = "Administrador";
+App::$strings["No Subject"] = "Sin asunto";
+App::$strings["Friendica"] = "Friendica";
+App::$strings["OStatus"] = "OStatus";
+App::$strings["GNU-Social"] = "GNU Social";
+App::$strings["RSS/Atom"] = "RSS/Atom";
+App::$strings["Diaspora"] = "Diaspora";
+App::$strings["Facebook"] = "Facebook";
+App::$strings["Zot"] = "Zot";
+App::$strings["LinkedIn"] = "LinkedIn";
+App::$strings["XMPP/IM"] = "XMPP/IM";
+App::$strings["MySpace"] = "MySpace";
+App::$strings["Image exceeds website size limit of %lu bytes"] = "La imagen excede el límite de %lu bytes del sitio";
+App::$strings["Image file is empty."] = "El fichero de imagen está vacío. ";
+App::$strings["Photo storage failed."] = "La foto no ha podido ser guardada.";
+App::$strings["a new photo"] = "una nueva foto";
+App::$strings["__ctx:photo_upload__ %1\$s posted %2\$s to %3\$s"] = "%1\$s ha publicado %2\$s en %3\$s";
+App::$strings["Photo Albums"] = "Álbumes de fotos";
+App::$strings["Upload New Photos"] = "Subir nuevas fotos";
+App::$strings["New window"] = "Nueva ventana";
+App::$strings["Open the selected location in a different window or browser tab"] = "Abrir la dirección seleccionada en una ventana o pestaña aparte";
+App::$strings["User '%s' deleted"] = "El usuario '%s' ha sido eliminado";
 App::$strings["Embedded content"] = "Contenido incorporado";
 App::$strings["Embedding disabled"] = "Incrustación deshabilitada";
+App::$strings["%d invitation available"] = array(
+	0 => "%d invitación pendiente",
+	1 => "%d invitaciones disponibles",
+);
+App::$strings["Find Channels"] = "Encontrar canales";
+App::$strings["Enter name or interest"] = "Introducir nombre o interés";
+App::$strings["Connect/Follow"] = "Conectar/Seguir";
+App::$strings["Examples: Robert Morgenstein, Fishing"] = "Ejemplos: José Fernández, Pesca";
+App::$strings["Random Profile"] = "Perfil aleatorio";
+App::$strings["Invite Friends"] = "Invitar a amigos";
+App::$strings["Advanced example: name=fred and country=iceland"] = "Ejemplo avanzado: nombre=juan y país=españa";
+App::$strings["Saved Folders"] = "Carpetas guardadas";
+App::$strings["Everything"] = "Todo";
+App::$strings["Categories"] = "Categorías";
+App::$strings["%d connection in common"] = array(
+	0 => "%d conexión en común",
+	1 => "%d conexiones en común",
+);
+App::$strings["show more"] = "mostrar más";
+App::$strings["%1\$s is now connected with %2\$s"] = "%1\$s ahora está conectado/a con %2\$s";
+App::$strings["%1\$s poked %2\$s"] = "%1\$s ha dado un toque a %2\$s";
+App::$strings["poked"] = "ha dado un toque a";
+App::$strings["View %s's profile @ %s"] = "Ver el perfil @ %s de %s";
+App::$strings["Categories:"] = "Categorías:";
+App::$strings["Filed under:"] = "Archivado bajo:";
+App::$strings["View in context"] = "Mostrar en su contexto";
+App::$strings["remove"] = "eliminar";
+App::$strings["Loading..."] = "Cargando...";
+App::$strings["Delete Selected Items"] = "Eliminar elementos seleccionados";
+App::$strings["View Source"] = "Ver el código fuente de la entrada";
+App::$strings["Follow Thread"] = "Seguir este hilo";
+App::$strings["Unfollow Thread"] = "Dejar de seguir este hilo";
+App::$strings["Activity/Posts"] = "Actividad y publicaciones";
+App::$strings["Edit Connection"] = "Editar conexión";
+App::$strings["Message"] = "Mensaje";
+App::$strings["%s likes this."] = "A %s le gusta esto.";
+App::$strings["%s doesn't like this."] = "A %s no le gusta esto.";
+App::$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.",
+);
+App::$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.",
+);
+App::$strings["and"] = "y";
+App::$strings[", and %d other people"] = array(
+	0 => ", y %d persona más",
+	1 => ", y %d personas más",
+);
+App::$strings["%s like this."] = "A %s le gusta esto.";
+App::$strings["%s don't like this."] = "A %s no le gusta esto.";
+App::$strings["Set your location"] = "Establecer su ubicación";
+App::$strings["Clear browser location"] = "Eliminar los datos de localización geográfica del navegador";
+App::$strings["Tag term:"] = "Término de la etiqueta:";
+App::$strings["Where are you right now?"] = "¿Donde está ahora?";
+App::$strings["Page link name"] = "Nombre del enlace de la página";
+App::$strings["Post as"] = "Publicar como";
+App::$strings["Toggle voting"] = "Cambiar votación";
+App::$strings["Categories (optional, comma-separated list)"] = "Categorías (opcional, lista separada por comas)";
+App::$strings["Set publish date"] = "Establecer la fecha de publicación";
+App::$strings["OK"] = "OK";
+App::$strings["Discover"] = "Descubrir";
+App::$strings["Imported public streams"] = "Contenidos públicos importados";
+App::$strings["Commented Order"] = "Comentarios recientes";
+App::$strings["Sort by Comment Date"] = "Ordenar por fecha de comentario";
+App::$strings["Posted Order"] = "Publicaciones recientes";
+App::$strings["Sort by Post Date"] = "Ordenar por fecha de publicación";
+App::$strings["Posts that mention or involve you"] = "Publicaciones que le mencionan o involucran";
+App::$strings["Activity Stream - by date"] = "Contenido - por fecha";
+App::$strings["Starred"] = "Preferidas";
+App::$strings["Favourite Posts"] = "Publicaciones favoritas";
+App::$strings["Spam"] = "Correo basura";
+App::$strings["Posts flagged as SPAM"] = "Publicaciones marcadas como basura";
+App::$strings["Status Messages and Posts"] = "Mensajes de estado y publicaciones";
+App::$strings["About"] = "Mi perfil";
+App::$strings["Profile Details"] = "Detalles del perfil";
+App::$strings["Files and Storage"] = "Ficheros y repositorio";
+App::$strings["Chatrooms"] = "Salas de chat";
+App::$strings["Bookmarks"] = "Marcadores";
+App::$strings["Saved Bookmarks"] = "Marcadores guardados";
+App::$strings["Manage Webpages"] = "Administrar páginas web";
+App::$strings["__ctx:noun__ Attending"] = array(
+	0 => "Participaré",
+	1 => "Participaré",
+);
+App::$strings["__ctx:noun__ Not Attending"] = array(
+	0 => "No participaré",
+	1 => "No participaré",
+);
+App::$strings["__ctx:noun__ Undecided"] = array(
+	0 => "Indeciso/a",
+	1 => "Indecisos/as",
+);
+App::$strings["__ctx:noun__ Agree"] = array(
+	0 => "De acuerdo",
+	1 => "De acuerdo",
+);
+App::$strings["__ctx:noun__ Disagree"] = array(
+	0 => "En desacuerdo",
+	1 => "En desacuerdo",
+);
+App::$strings["__ctx:noun__ Abstain"] = array(
+	0 => "se abstiene",
+	1 => "Se abstienen",
+);
+App::$strings["l F d, Y \\@ g:i A"] = "l d de F, Y \\@ G:i";
+App::$strings["Starts:"] = "Comienza:";
+App::$strings["Finishes:"] = "Finaliza:";
+App::$strings["This event has been added to your calendar."] = "Este evento ha sido añadido a su calendario.";
+App::$strings["Not specified"] = "Sin especificar";
+App::$strings["Needs Action"] = "Necesita de una intervención";
+App::$strings["Completed"] = "Completado/a";
+App::$strings["In Process"] = "En proceso";
+App::$strings["Cancelled"] = "Cancelado/a";
+App::$strings["No recipient provided."] = "No se ha especificado ningún destinatario.";
+App::$strings["[no subject]"] = "[sin asunto]";
+App::$strings["Unable to determine sender."] = "No ha sido posible determinar el remitente. ";
+App::$strings["Stored post could not be verified."] = "No se han podido verificar las publicaciones guardadas.";
+App::$strings["Frequently"] = "Frecuentemente";
+App::$strings["Hourly"] = "Cada hora";
+App::$strings["Twice daily"] = "Dos veces al día";
+App::$strings["Daily"] = "Diariamente";
+App::$strings["Weekly"] = "Semanalmente";
+App::$strings["Monthly"] = "Mensualmente";
 App::$strings["Currently Male"] = "Actualmente hombre";
 App::$strings["Currently Female"] = "Actualmente mujer";
 App::$strings["Mostly Male"] = "Generalmente hombre";
@@ -1472,111 +1727,31 @@ App::$strings["Uncertain"] = "Indeterminado";
 App::$strings["It's complicated"] = "Es complicado";
 App::$strings["Don't care"] = "No me importa";
 App::$strings["Ask me"] = "Pregúnteme";
-App::$strings["New window"] = "Nueva ventana";
-App::$strings["Open the selected location in a different window or browser tab"] = "Abrir la dirección seleccionada en una ventana o pestaña aparte";
-App::$strings["User '%s' deleted"] = "El usuario '%s' ha sido eliminado";
-App::$strings["Invalid data packet"] = "Paquete de datos no válido";
-App::$strings["Unable to verify channel signature"] = "No ha sido posible de verificar la firma del canal";
-App::$strings["Unable to verify site signature for %s"] = "No ha sido posible de verificar la firma del sitio para %s";
-App::$strings["invalid target signature"] = "La firma recibida no es válida";
-App::$strings["%d invitation available"] = array(
-	0 => "%d invitación pendiente",
-	1 => "%d invitaciones disponibles",
-);
-App::$strings["Find Channels"] = "Encontrar canales";
-App::$strings["Enter name or interest"] = "Introducir nombre o interés";
-App::$strings["Connect/Follow"] = "Conectar/Seguir";
-App::$strings["Examples: Robert Morgenstein, Fishing"] = "Ejemplos: José Fernández, Pesca";
-App::$strings["Random Profile"] = "Perfil aleatorio";
-App::$strings["Invite Friends"] = "Invitar a amigos";
-App::$strings["Advanced example: name=fred and country=iceland"] = "Ejemplo avanzado: nombre=juan y país=españa";
-App::$strings["Saved Folders"] = "Carpetas guardadas";
-App::$strings["Everything"] = "Todo";
-App::$strings["Categories"] = "Categorías";
-App::$strings["%d connection in common"] = array(
-	0 => "%d conexión en común",
-	1 => "%d conexiones en común",
-);
-App::$strings["show more"] = "mostrar más";
-App::$strings["l F d, Y \\@ g:i A"] = "l d de F, Y \\@ G:i";
-App::$strings["Starts:"] = "Comienza:";
-App::$strings["Finishes:"] = "Finaliza:";
-App::$strings["This event has been added to your calendar."] = "Este evento ha sido añadido a su calendario.";
-App::$strings["Not specified"] = "Sin especificar";
-App::$strings["Needs Action"] = "Necesita de una intervención";
-App::$strings["Completed"] = "Completado/a";
-App::$strings["In Process"] = "En proceso";
-App::$strings["Cancelled"] = "Cancelado/a";
-App::$strings["System"] = "Sistema";
-App::$strings["New App"] = "Nueva aplicación (app)";
-App::$strings["Suggestions"] = "Sugerencias";
-App::$strings["See more..."] = "Ver más...";
-App::$strings["You have %1$.0f of %2$.0f allowed connections."] = "Tiene %1$.0f de %2$.0f conexiones permitidas.";
-App::$strings["Add New Connection"] = "Añadir nueva conexión";
-App::$strings["Enter channel address"] = "Dirección del canal";
-App::$strings["Examples: bob@example.com, https://example.com/barbara"] = "Ejemplos: manuel@ejemplo.com, https://ejemplo.com/carmen";
-App::$strings["Notes"] = "Notas";
-App::$strings["Remove term"] = "Eliminar término";
-App::$strings["Saved Searches"] = "Búsquedas guardadas";
-App::$strings["add"] = "añadir";
-App::$strings["Archives"] = "Hemeroteca";
-App::$strings["Refresh"] = "Recargar";
-App::$strings["Account settings"] = "Configuración de la cuenta";
-App::$strings["Channel settings"] = "Configuración del canal";
-App::$strings["Additional features"] = "Funcionalidades";
-App::$strings["Feature/Addon settings"] = "Complementos";
-App::$strings["Display settings"] = "Ajustes de visualización";
-App::$strings["Manage locations"] = "Gestión de ubicaciones (clones) del canal";
-App::$strings["Export channel"] = "Exportar canal";
-App::$strings["Connected apps"] = "Aplicaciones (apps) conectadas";
-App::$strings["Premium Channel Settings"] = "Configuración del canal premium";
-App::$strings["Private Mail Menu"] = "Menú de correo privado";
-App::$strings["Combined View"] = "Vista combinada";
-App::$strings["Inbox"] = "Bandeja de entrada";
-App::$strings["Outbox"] = "Bandeja de salida";
-App::$strings["New Message"] = "Nuevo mensaje";
-App::$strings["Conversations"] = "Conversaciones";
-App::$strings["Received Messages"] = "Mensajes recibidos";
-App::$strings["Sent Messages"] = "Enviar mensajes";
-App::$strings["No messages."] = "Sin mensajes.";
-App::$strings["Delete conversation"] = "Eliminar conversación";
-App::$strings["Events Menu"] = "Menú de eventos";
-App::$strings["Day View"] = "Eventos del día";
-App::$strings["Week View"] = "Eventos de la semana";
-App::$strings["Month View"] = "Eventos del mes";
-App::$strings["Events Tools"] = "Gestión de eventos";
-App::$strings["Export Calendar"] = "Exportar el calendario";
-App::$strings["Import Calendar"] = "Importar un calendario";
-App::$strings["Chatrooms"] = "Salas de chat";
-App::$strings["Overview"] = "Resumen";
-App::$strings["Chat Members"] = "Miembros del chat";
-App::$strings["Bookmarked Chatrooms"] = "Salas de chat preferidas";
-App::$strings["Suggested Chatrooms"] = "Salas de chat sugeridas";
-App::$strings["photo/image"] = "foto/imagen";
-App::$strings["Click to show more"] = "Hacer clic para ver más";
-App::$strings["Rating Tools"] = "Valoraciones";
-App::$strings["Rate Me"] = "Valorar este canal";
-App::$strings["View Ratings"] = "Mostrar las valoraciones";
-App::$strings["Forums"] = "Foros";
-App::$strings["Tasks"] = "Tareas";
-App::$strings["Documentation"] = "Documentación";
-App::$strings["Project/Site Information"] = "Información sobre el proyecto o sitio";
-App::$strings["For Members"] = "Para los miembros";
-App::$strings["For Administrators"] = "Para los administradores";
-App::$strings["For Developers"] = "Para los desarrolladores";
-App::$strings["Accounts"] = "Cuentas";
-App::$strings["Member registrations waiting for confirmation"] = "Inscripciones de nuevos miembros pendientes de aprobación";
-App::$strings["Features"] = "Funcionalidades";
-App::$strings["Inspect queue"] = "Examinar la cola";
-App::$strings["DB updates"] = "Actualizaciones de la base de datos";
-App::$strings["Admin"] = "Administrador";
-App::$strings["Plugin Features"] = "Extensiones";
+App::$strings["Image/photo"] = "Imagen/foto";
+App::$strings["Encrypted content"] = "Contenido cifrado";
+App::$strings["Install %s element: "] = "Instalar el elemento %s:";
+App::$strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Esta entrada contiene el elemento instalable %s, sin embargo le faltan permisos para instalarlo en este sitio.";
+App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s escribió %2\$s siguiente %3\$s";
+App::$strings["Click to open/close"] = "Pulsar para abrir/cerrar";
+App::$strings["spoiler"] = "spoiler";
+App::$strings["Different viewers will see this text differently"] = "Visitantes diferentes verán este texto de forma distinta";
+App::$strings["$1 wrote:"] = "$1 escribió:";
 App::$strings["%1\$s's bookmarks"] = "Marcadores de %1\$s";
-App::$strings["Missing room name"] = "Sala de chat sin nombre";
-App::$strings["Duplicate room name"] = "Nombre de sala duplicado.";
-App::$strings["Invalid room specifier."] = "Especificador de sala no válido.";
-App::$strings["Room not found."] = "Sala no encontrada.";
-App::$strings["Room is full"] = "La sala está llena.";
+App::$strings["Item was not found."] = "Elemento no encontrado.";
+App::$strings["No source file."] = "Ningún fichero de origen";
+App::$strings["Cannot locate file to replace"] = "No se puede localizar el fichero que va a ser sustituido.";
+App::$strings["Cannot locate file to revise/update"] = "No se puede localizar el fichero para revisar/actualizar";
+App::$strings["File exceeds size limit of %d"] = "El fichero supera el limite de tamaño de %d";
+App::$strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Ha alcanzado su límite de %1$.0f Mbytes de almacenamiento de adjuntos.";
+App::$strings["File upload failed. Possible system limit or action terminated."] = "Error de carga, posiblemente por limite del sistema o porque la acción ha finalizado.";
+App::$strings["Stored file could not be verified. Upload failed."] = "El fichero almacenado no ha podido ser verificado. El envío ha fallado.";
+App::$strings["Path not available."] = "Ruta no disponible.";
+App::$strings["Empty pathname"] = "Ruta vacía";
+App::$strings["duplicate filename or path"] = "Nombre duplicado de ruta o fichero";
+App::$strings["Path not found."] = "Ruta no encontrada";
+App::$strings["mkdir failed."] = "mkdir ha fallado.";
+App::$strings["database storage failed."] = "el almacenamiento en la base de datos ha fallado.";
+App::$strings["Empty path"] = "Ruta vacía";
 App::$strings["Unable to obtain identity information from database"] = "No ha sido posible obtener información sobre la identidad desde la base de datos";
 App::$strings["Empty name"] = "Nombre vacío";
 App::$strings["Name too long"] = "Nombre demasiado largo";
@@ -1594,12 +1769,6 @@ App::$strings["Gender:"] = "Género:";
 App::$strings["Status:"] = "Estado:";
 App::$strings["Homepage:"] = "Página personal:";
 App::$strings["Online Now"] = "Ahora en línea";
-App::$strings["F d"] = "d F";
-App::$strings["Birthday Reminders"] = "Recordatorios de cumpleaños";
-App::$strings["Birthdays this week:"] = "Cumpleaños de esta semana:";
-App::$strings["[No description]"] = "[Sin descripción]";
-App::$strings["Event Reminders"] = "Recordatorios de eventos";
-App::$strings["Events this week:"] = "Eventos de esta semana:";
 App::$strings["Like this channel"] = "Me gusta este canal";
 App::$strings["j F, Y"] = "j F Y";
 App::$strings["j F"] = "j F";
@@ -1623,13 +1792,6 @@ App::$strings["Work/employment:"] = "Trabajo:";
 App::$strings["School/education:"] = "Estudios:";
 App::$strings["Like this thing"] = "Me gusta esto";
 App::$strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "El \"token\" de seguridad del formulario no es correcto. Esto ha ocurrido probablemente porque el formulario ha estado abierto demasiado tiempo (>3 horas) antes de ser enviado";
-App::$strings["Image exceeds website size limit of %lu bytes"] = "La imagen excede el límite de %lu bytes del sitio";
-App::$strings["Image file is empty."] = "El fichero de imagen está vacío. ";
-App::$strings["Photo storage failed."] = "La foto no ha podido ser guardada.";
-App::$strings["a new photo"] = "una nueva foto";
-App::$strings["__ctx:photo_upload__ %1\$s posted %2\$s to %3\$s"] = "%1\$s ha publicado %2\$s en %3\$s";
-App::$strings["Photo Albums"] = "Álbumes de fotos";
-App::$strings["Upload New Photos"] = "Subir nuevas fotos";
 App::$strings["Logout"] = "Finalizar sesión";
 App::$strings["End this session"] = "Finalizar esta sesión";
 App::$strings["Home"] = "Inicio";
@@ -1639,12 +1801,9 @@ App::$strings["Manage/Edit profiles"] = "Administrar/editar perfiles";
 App::$strings["Edit your profile"] = "Editar su perfil";
 App::$strings["Your photos"] = "Sus fotos";
 App::$strings["Your files"] = "Sus ficheros";
-App::$strings["Chat"] = "Chat";
 App::$strings["Your chatrooms"] = "Sus salas de chat";
-App::$strings["Bookmarks"] = "Marcadores";
 App::$strings["Your bookmarks"] = "Sus marcadores";
 App::$strings["Your webpages"] = "Sus páginas web";
-App::$strings["Login"] = "Iniciar sesión";
 App::$strings["Sign in"] = "Acceder";
 App::$strings["%s - click to logout"] = "%s - pulsar para finalizar sesión";
 App::$strings["Remote authentication"] = "Acceder desde su servidor";
@@ -1654,64 +1813,96 @@ App::$strings["Create an account"] = "Crear una cuenta";
 App::$strings["Help and documentation"] = "Ayuda y documentación";
 App::$strings["Applications, utilities, links, games"] = "Aplicaciones, utilidades, enlaces, juegos";
 App::$strings["Search site @name, #tag, ?docs, content"] = "Buscar en el sitio por @nombre, #etiqueta, ?ayuda o contenido";
-App::$strings["Directory"] = "Directorio";
 App::$strings["Channel Directory"] = "Directorio de canales";
-App::$strings["Grid"] = "Red";
 App::$strings["Your grid"] = "Mi red";
 App::$strings["Mark all grid notifications seen"] = "Marcar todas las notificaciones de la red como vistas";
-App::$strings["Channel Home"] = "Mi canal";
 App::$strings["Channel home"] = "Mi canal";
 App::$strings["Mark all channel notifications seen"] = "Marcar todas las notificaciones del canal como leídas";
 App::$strings["Notices"] = "Avisos";
 App::$strings["Notifications"] = "Notificaciones";
 App::$strings["See all notifications"] = "Ver todas las notificaciones";
-App::$strings["Mail"] = "Correo";
 App::$strings["Private mail"] = "Correo privado";
 App::$strings["See all private messages"] = "Ver todas los mensajes privados";
 App::$strings["Mark all private messages seen"] = "Marcar todos los mensajes privados como leídos";
-App::$strings["Events"] = "Eventos";
+App::$strings["Inbox"] = "Bandeja de entrada";
+App::$strings["Outbox"] = "Bandeja de salida";
+App::$strings["New Message"] = "Nuevo mensaje";
 App::$strings["Event Calendar"] = "Calendario de eventos";
 App::$strings["See all events"] = "Ver todos los eventos";
 App::$strings["Mark all events seen"] = "Marcar todos los eventos como leidos";
 App::$strings["Manage Your Channels"] = "Gestionar sus canales";
 App::$strings["Account/Channel Settings"] = "Ajustes de cuenta/canales";
+App::$strings["Admin"] = "Administrador";
 App::$strings["Site Setup and Configuration"] = "Ajustes y configuración del sitio";
-App::$strings["Loading..."] = "Cargando...";
 App::$strings["@name, #tag, ?doc, content"] = "@nombre, #etiqueta, ?ayuda, contenido";
 App::$strings["Please wait..."] = "Espere por favor…";
-App::$strings["Frequently"] = "Frecuentemente";
-App::$strings["Hourly"] = "Cada hora";
-App::$strings["Twice daily"] = "Dos veces al día";
-App::$strings["Daily"] = "Diariamente";
-App::$strings["Weekly"] = "Semanalmente";
-App::$strings["Monthly"] = "Mensualmente";
-App::$strings["Friendica"] = "Friendica";
-App::$strings["OStatus"] = "OStatus";
-App::$strings["GNU-Social"] = "GNU Social";
-App::$strings["RSS/Atom"] = "RSS/Atom";
-App::$strings["Diaspora"] = "Diaspora";
-App::$strings["Facebook"] = "Facebook";
-App::$strings["Zot"] = "Zot";
-App::$strings["LinkedIn"] = "LinkedIn";
-App::$strings["XMPP/IM"] = "XMPP/IM";
-App::$strings["MySpace"] = "MySpace";
-App::$strings["Logged out."] = "Desconectado/a.";
-App::$strings["Failed authentication"] = "Autenticación fallida.";
-App::$strings["Item was not found."] = "Elemento no encontrado.";
-App::$strings["No source file."] = "Ningún fichero de origen";
-App::$strings["Cannot locate file to replace"] = "No se puede localizar el fichero que va a ser sustituido.";
-App::$strings["Cannot locate file to revise/update"] = "No se puede localizar el fichero para revisar/actualizar";
-App::$strings["File exceeds size limit of %d"] = "El fichero supera el limite de tamaño de %d";
-App::$strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Ha alcanzado su límite de %1$.0f Mbytes de almacenamiento de adjuntos.";
-App::$strings["File upload failed. Possible system limit or action terminated."] = "Error de carga, posiblemente por limite del sistema o porque la acción ha finalizado.";
-App::$strings["Stored file could not be verified. Upload failed."] = "El fichero almacenado no ha podido ser verificado. El envío ha fallado.";
-App::$strings["Path not available."] = "Ruta no disponible.";
-App::$strings["Empty pathname"] = "Ruta vacía";
-App::$strings["duplicate filename or path"] = "Nombre duplicado de ruta o fichero";
-App::$strings["Path not found."] = "Ruta no encontrada";
-App::$strings["mkdir failed."] = "mkdir ha fallado.";
-App::$strings["database storage failed."] = "el almacenamiento en la base de datos ha fallado.";
-App::$strings["Empty path"] = "Ruta vacía";
+App::$strings["System"] = "Sistema";
+App::$strings["New App"] = "Nueva aplicación (app)";
+App::$strings["Suggestions"] = "Sugerencias";
+App::$strings["See more..."] = "Ver más...";
+App::$strings["You have %1$.0f of %2$.0f allowed connections."] = "Tiene %1$.0f de %2$.0f conexiones permitidas.";
+App::$strings["Add New Connection"] = "Añadir nueva conexión";
+App::$strings["Enter channel address"] = "Dirección del canal";
+App::$strings["Examples: bob@example.com, https://example.com/barbara"] = "Ejemplos: manuel@ejemplo.com, https://ejemplo.com/carmen";
+App::$strings["Notes"] = "Notas";
+App::$strings["Remove term"] = "Eliminar término";
+App::$strings["Saved Searches"] = "Búsquedas guardadas";
+App::$strings["add"] = "añadir";
+App::$strings["Archives"] = "Hemeroteca";
+App::$strings["Refresh"] = "Recargar";
+App::$strings["Account settings"] = "Configuración de la cuenta";
+App::$strings["Channel settings"] = "Configuración del canal";
+App::$strings["Additional features"] = "Funcionalidades";
+App::$strings["Feature/Addon settings"] = "Complementos";
+App::$strings["Display settings"] = "Ajustes de visualización";
+App::$strings["Manage locations"] = "Gestión de ubicaciones (clones) del canal";
+App::$strings["Export channel"] = "Exportar canal";
+App::$strings["Connected apps"] = "Aplicaciones (apps) conectadas";
+App::$strings["Premium Channel Settings"] = "Configuración del canal premium";
+App::$strings["Private Mail Menu"] = "Menú de correo privado";
+App::$strings["Combined View"] = "Vista combinada";
+App::$strings["Conversations"] = "Conversaciones";
+App::$strings["Received Messages"] = "Mensajes recibidos";
+App::$strings["Sent Messages"] = "Enviar mensajes";
+App::$strings["No messages."] = "Sin mensajes.";
+App::$strings["Delete conversation"] = "Eliminar conversación";
+App::$strings["Events Menu"] = "Menú de eventos";
+App::$strings["Day View"] = "Eventos del día";
+App::$strings["Week View"] = "Eventos de la semana";
+App::$strings["Month View"] = "Eventos del mes";
+App::$strings["Events Tools"] = "Gestión de eventos";
+App::$strings["Export Calendar"] = "Exportar el calendario";
+App::$strings["Import Calendar"] = "Importar un calendario";
+App::$strings["Overview"] = "Resumen";
+App::$strings["Chat Members"] = "Miembros del chat";
+App::$strings["Bookmarked Chatrooms"] = "Salas de chat preferidas";
+App::$strings["Suggested Chatrooms"] = "Salas de chat sugeridas";
+App::$strings["photo/image"] = "foto/imagen";
+App::$strings["Click to show more"] = "Hacer clic para ver más";
+App::$strings["Rating Tools"] = "Valoraciones";
+App::$strings["Rate Me"] = "Valorar este canal";
+App::$strings["View Ratings"] = "Mostrar las valoraciones";
+App::$strings["Forums"] = "Foros";
+App::$strings["Tasks"] = "Tareas";
+App::$strings["Documentation"] = "Documentación";
+App::$strings["Project/Site Information"] = "Información sobre el proyecto o sitio";
+App::$strings["For Members"] = "Para los miembros";
+App::$strings["For Administrators"] = "Para los administradores";
+App::$strings["For Developers"] = "Para los desarrolladores";
+App::$strings["Accounts"] = "Cuentas";
+App::$strings["Member registrations waiting for confirmation"] = "Inscripciones de nuevos miembros pendientes de aprobación";
+App::$strings["Inspect queue"] = "Examinar la cola";
+App::$strings["DB updates"] = "Actualizaciones de la base de datos";
+App::$strings["Plugin Features"] = "Extensiones";
+App::$strings["Visible to your default audience"] = "Visible para su público predeterminado.";
+App::$strings["Only me"] = "Sólo yo";
+App::$strings["Who can see this?"] = "¿Quién puede ver esto?";
+App::$strings["Custom selection"] = "Selección personalizada";
+App::$strings["Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit the scope of \"Show\"."] = "Seleccione \"Mostrar\" para permitir la visualización. La opción \"No mostrar\" le permite anular y limitar el alcance de \"Mostrar\".";
+App::$strings["Show"] = "Mostrar";
+App::$strings["Don't show"] = "No mostrar";
+App::$strings["Other networks and post services"] = "Otras redes y servicios de publicación";
+App::$strings["Post permissions %s cannot be changed %s after a post is shared.</br />These permissions set who is allowed to view the post."] = "Los permisos de la entrada %s no se pueden cambiar %s una vez que se ha compartido.</br /> Estos permisos establecen quién está autorizado para ver el mensaje.";
 App::$strings["Birthday"] = "Cumpleaños";
 App::$strings["Age: "] = "Edad:";
 App::$strings["YYYY-MM-DD or MM-DD"] = "AAAA-MM-DD o MM-DD";
@@ -1748,100 +1939,26 @@ App::$strings["__ctx:relative_date__ second"] = array(
 );
 App::$strings["%1\$s's birthday"] = "Cumpleaños de %1\$s";
 App::$strings["Happy Birthday %1\$s"] = "Feliz cumpleaños %1\$s";
-App::$strings["Directory Options"] = "Opciones del directorio";
-App::$strings["Safe Mode"] = "Modo seguro";
-App::$strings["Public Forums Only"] = "Solo foros públicos";
-App::$strings["This Website Only"] = "Solo este sitio web";
-App::$strings["\$Projectname Notification"] = "Notificación de \$Projectname";
-App::$strings["\$projectname"] = "\$projectname";
-App::$strings["Thank You,"] = "Gracias,";
-App::$strings["%s Administrator"] = "%s Administrador";
-App::$strings["%s <!item_type!>"] = "%s <!item_type!>";
-App::$strings["[Hubzilla:Notify] New mail received at %s"] = "[Hubzilla:Aviso] Nuevo mensaje en %s";
-App::$strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s le ha enviado un nuevo mensaje privado en %3\$s.";
-App::$strings["%1\$s sent you %2\$s."] = "%1\$s le ha enviado %2\$s.";
-App::$strings["a private message"] = "un mensaje privado";
-App::$strings["Please visit %s to view and/or reply to your private messages."] = "Por favor visite %s para ver y/o responder a su mensaje privado.";
-App::$strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s ha comentado [zrl=%3\$s]%4\$s[/zrl]";
-App::$strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s ha comentado [zrl=%3\$s]%5\$s de %4\$s[/zrl] ";
-App::$strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s ha comentado [zrl=%3\$s]%4\$s creado por usted[/zrl]";
-App::$strings["[Hubzilla:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Hubzilla:Aviso] Nuevo comentario de %2\$s a la conversación #%1\$d";
-App::$strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s ha comentado un elemento/conversación que ha estado siguiendo.";
-App::$strings["Please visit %s to view and/or reply to the conversation."] = "Para ver o comentar la conversación, visite %s";
-App::$strings["[Hubzilla:Notify] %s posted to your profile wall"] = "[Hubzilla:Aviso] %s ha publicado una entrada en su página de inicio del perfil (\"muro\")";
-App::$strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = "%1\$s, %2\$s ha publicado en su página del perfil en %3\$s";
-App::$strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = "%1\$s, %2\$s ha publicado en [zrl=%3\$s]su página del perfil[/zrl]";
-App::$strings["[Hubzilla:Notify] %s tagged you"] = "[Hubzilla:Aviso] %s le ha etiquetado";
-App::$strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, %2\$s le ha etiquetado en %3\$s";
-App::$strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "%1\$s, %2\$s [zrl=%3\$s]le etiquetó[/zrl].";
-App::$strings["[Hubzilla:Notify] %1\$s poked you"] = "[Hubzilla:Aviso] %1\$s le ha dado un toque";
-App::$strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s le ha dado un toque en %3\$s";
-App::$strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s, %2\$s [zrl=%2\$s]le ha dado un toque[/zrl].";
-App::$strings["[Hubzilla:Notify] %s tagged your post"] = "[Hubzilla:Aviso] %s ha etiquetado su publicación";
-App::$strings["%1\$s, %2\$s tagged your post at %3\$s"] = "%1\$s, %2\$s ha etiquetado su publicación en %3\$s";
-App::$strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "%1\$s, %2\$s ha etiquetado [zrl=%3\$s]su publicación[/zrl]";
-App::$strings["[Hubzilla:Notify] Introduction received"] = "[Hubzilla:Aviso] Ha recibido una solicitud de conexión";
-App::$strings["%1\$s, you've received an new connection request from '%2\$s' at %3\$s"] = "%1\$s, ha recibido una nueva solicitud de conexión de '%2\$s' en  %3\$s";
-App::$strings["%1\$s, you've received [zrl=%2\$s]a new connection request[/zrl] from %3\$s."] = "%1\$s, ha recibido [zrl=%2\$s]una nueva solicitud de conexión[/zrl] de %3\$s.";
-App::$strings["You may visit their profile at %s"] = "Puede visitar su perfil en %s";
-App::$strings["Please visit %s to approve or reject the connection request."] = "Por favor, visite %s para permitir o rechazar la solicitad de conexión.";
-App::$strings["[Hubzilla:Notify] Friend suggestion received"] = "[Hubzilla:Aviso] Ha recibido una sugerencia de amistad";
-App::$strings["%1\$s, you've received a friend suggestion from '%2\$s' at %3\$s"] = "%1\$s, ha recibido una sugerencia de conexión de '%2\$s' en %3\$s";
-App::$strings["%1\$s, you've received [zrl=%2\$s]a friend suggestion[/zrl] for %3\$s from %4\$s."] = "%1\$s, ha recibido [zrl=%2\$s]una sugerencia de conexión[/zrl] para %3\$s de %4\$s.";
-App::$strings["Name:"] = "Nombre:";
-App::$strings["Photo:"] = "Foto:";
-App::$strings["Please visit %s to approve or reject the suggestion."] = "Por favor, visite %s para aprobar o rechazar la sugerencia.";
-App::$strings["[Hubzilla:Notify]"] = "[Hubzilla:Aviso]";
-App::$strings["Private Message"] = "Mensaje Privado";
-App::$strings["Select"] = "Seleccionar";
-App::$strings["Save to Folder"] = "Guardar en carpeta";
-App::$strings["I will attend"] = "Participaré";
-App::$strings["I will not attend"] = "No participaré";
-App::$strings["I might attend"] = "Quizá participe";
-App::$strings["I agree"] = "Estoy de acuerdo";
-App::$strings["I disagree"] = "No estoy de acuerdo";
-App::$strings["I abstain"] = "Me abstengo";
-App::$strings["Add Star"] = "Destacar añadiendo una estrella";
-App::$strings["Remove Star"] = "Eliminar estrella";
-App::$strings["Toggle Star Status"] = "Activar o desactivar el estado de entrada preferida";
-App::$strings["starred"] = "preferidas";
-App::$strings["Message signature validated"] = "Firma de mensaje validada";
-App::$strings["Message signature incorrect"] = "Firma de mensaje incorrecta";
-App::$strings["Add Tag"] = "Añadir etiqueta";
-App::$strings["like"] = "me gusta";
-App::$strings["dislike"] = "no me gusta";
-App::$strings["Share This"] = "Compartir esto";
-App::$strings["share"] = "compartir";
-App::$strings["Delivery Report"] = "Informe de transmisión";
-App::$strings["%d comment"] = array(
-	0 => "%d comentario",
-	1 => "%d comentarios",
-);
-App::$strings["View %s's profile - %s"] = "Ver el perfil de %s - %s";
-App::$strings["to"] = "a";
-App::$strings["via"] = "mediante";
-App::$strings["Wall-to-Wall"] = "De página del perfil a página del perfil (de \"muro\" a \"muro\")";
-App::$strings["via Wall-To-Wall:"] = "Mediante el procedimiento página del perfil a página del perfil (de \"muro\" a \"muro\")";
-App::$strings["from %s"] = "desde %s";
-App::$strings["last edited: %s"] = "último cambio: %s";
-App::$strings["Expires: %s"] = "Caduca: %s";
-App::$strings["Save Bookmarks"] = "Guardar en Marcadores";
-App::$strings["Add to Calendar"] = "Añadir al calendario";
-App::$strings["Mark all seen"] = "Marcar todo como visto";
-App::$strings["[+] show all"] = "[+] mostrar todo:";
-App::$strings["Bold"] = "Negrita";
-App::$strings["Italic"] = "Itálico ";
-App::$strings["Underline"] = "Subrayar";
-App::$strings["Quote"] = "Citar";
-App::$strings["Code"] = "Código";
-App::$strings["Image"] = "Imagen";
-App::$strings["Insert Link"] = "Insertar enlace";
-App::$strings["Video"] = "Vídeo";
-App::$strings[" and "] = "  y ";
-App::$strings["public profile"] = "el perfil público";
-App::$strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s ha cambiado %2\$s a &ldquo;%3\$s&rdquo;";
-App::$strings["Visit %1\$s's %2\$s"] = "Visitar %2\$s de %1\$s";
-App::$strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s ha actualizado %2\$s, cambiando %3\$s.";
+App::$strings["Not a valid email address"] = "Dirección de correo no válida";
+App::$strings["Your email domain is not among those allowed on this site"] = "Su dirección de correo no pertenece a ninguno de los dominios permitidos en este sitio.";
+App::$strings["Your email address is already registered at this site."] = "Su dirección de correo está ya registrada en este sitio.";
+App::$strings["An invitation is required."] = "Es obligatorio que le inviten.";
+App::$strings["Invitation could not be verified."] = "No se ha podido verificar su invitación.";
+App::$strings["Please enter the required information."] = "Por favor introduzca la información requerida.";
+App::$strings["Failed to store account information."] = "La información de la cuenta no se ha podido guardar.";
+App::$strings["Registration confirmation for %s"] = "Confirmación de registro para %s";
+App::$strings["Registration request at %s"] = "Solicitud de registro en %s";
+App::$strings["your registration password"] = "su contraseña de registro";
+App::$strings["Registration details for %s"] = "Detalles del registro de %s";
+App::$strings["Account approved."] = "Cuenta aprobada.";
+App::$strings["Registration revoked for %s"] = "Registro revocado para %s";
+App::$strings["Account verified. Please login."] = "Cuenta verificada. Por favor, inicie sesión.";
+App::$strings["Click here to upgrade."] = "Pulse aquí para actualizar";
+App::$strings["This action exceeds the limits set by your subscription plan."] = "Esta acción supera los límites establecidos por su plan de suscripción ";
+App::$strings["This action is not available under your subscription plan."] = "Esta acción no está disponible en su plan de suscripción.";
+App::$strings["Public Timeline"] = "Cronología pública";
+App::$strings["Logged out."] = "Desconectado/a.";
+App::$strings["Failed authentication"] = "Autenticación fallida.";
 App::$strings["Channel is blocked on this site."] = "El canal está bloqueado en este sitio.";
 App::$strings["Channel location missing."] = "Falta la dirección del canal.";
 App::$strings["Response from remote channel was incomplete."] = "Respuesta incompleta del canal.";
@@ -1849,6 +1966,21 @@ App::$strings["Channel was deleted and no longer exists."] = "El canal ha sido e
 App::$strings["Protocol disabled."] = "Protocolo deshabilitado.";
 App::$strings["Channel discovery failed."] = "El intento de acceder al canal ha fallado.";
 App::$strings["Cannot connect to yourself."] = "No puede conectarse consigo mismo.";
+App::$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.";
+App::$strings["Channel clone failed. Import failed."] = "La clonación del canal no ha salido bien. La importación ha fallado.";
+App::$strings["(Unknown)"] = "(Desconocido)";
+App::$strings["Visible to anybody on the internet."] = "Visible para cualquiera en internet.";
+App::$strings["Visible to you only."] = "Visible sólo para usted.";
+App::$strings["Visible to anybody in this network."] = "Visible para cualquiera en esta red.";
+App::$strings["Visible to anybody authenticated."] = "Visible para cualquiera que esté autenticado.";
+App::$strings["Visible to anybody on %s."] = "Visible para cualquiera en %s.";
+App::$strings["Visible to all connections."] = "Visible para todas las conexiones.";
+App::$strings["Visible to approved connections."] = "Visible para las conexiones permitidas.";
+App::$strings["Visible to specific connections."] = "Visible para conexiones específicas.";
+App::$strings["Privacy group is empty."] = "El grupo de canales está vacío.";
+App::$strings["Privacy group: %s"] = "Grupo de canales: %s";
+App::$strings["Connection not found."] = "Conexión no encontrada";
+App::$strings["profile photo"] = "foto del perfil";
 App::$strings["General Features"] = "Funcionalidades básicas";
 App::$strings["Content Expiration"] = "Caducidad del contenido";
 App::$strings["Remove posts/comments and/or private messages at a future time"] = "Eliminar publicaciones/comentarios y/o mensajes privados más adelante";
@@ -1902,7 +2034,6 @@ App::$strings["Affinity Tool"] = "Herramienta de afinidad";
 App::$strings["Filter stream activity by depth of relationships"] = "Filtrar el contenido según la profundidad de las relaciones";
 App::$strings["Connection Filtering"] = "Filtrado de conexiones";
 App::$strings["Filter incoming posts from connections based on keywords/content"] = "Filtrar publicaciones entrantes de conexiones por palabras clave o contenido";
-App::$strings["Suggest Channels"] = "Sugerir canales";
 App::$strings["Show channel suggestions"] = "Mostrar sugerencias de canales";
 App::$strings["Post/Comment Tools"] = "Gestión de entradas y comentarios";
 App::$strings["Community Tagging"] = "Etiquetas de la comunidad";
@@ -1916,112 +2047,12 @@ App::$strings["Star Posts"] = "Entradas destacadas";
 App::$strings["Ability to mark special posts with a star indicator"] = "Capacidad de marcar entradas destacadas con un indicador de estrella";
 App::$strings["Tag Cloud"] = "Nube de etiquetas";
 App::$strings["Provide a personal tag cloud on your channel page"] = "Proveer nube de etiquetas personal en su página de canal";
-App::$strings["No recipient provided."] = "No se ha especificado ningún destinatario.";
-App::$strings["[no subject]"] = "[sin asunto]";
-App::$strings["Unable to determine sender."] = "No ha sido posible determinar el remitente. ";
-App::$strings["Stored post could not be verified."] = "No se han podido verificar las publicaciones guardadas.";
-App::$strings["view full size"] = "Ver en el tamaño original";
-App::$strings["Administrator"] = "Administrador";
-App::$strings["No Subject"] = "Sin asunto";
 App::$strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Un grupo suprimido con este nombre ha sido restablecido. <strong>Es posible</strong> que los permisos existentes  sean aplicados a este grupo y sus futuros miembros. Si no quiere esto, por favor cree otro grupo con un nombre diferente.";
 App::$strings["Add new connections to this privacy group"] = "Añadir conexiones nuevas a este grupo de canales";
 App::$strings["edit"] = "editar";
 App::$strings["Edit group"] = "Editar grupo";
 App::$strings["Add privacy group"] = "Añadir un grupo de canales";
 App::$strings["Channels not in any privacy group"] = "Sin canales en ningún grupo";
-App::$strings["Image/photo"] = "Imagen/foto";
-App::$strings["Encrypted content"] = "Contenido cifrado";
-App::$strings["Install %s element: "] = "Instalar el elemento %s:";
-App::$strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Esta entrada contiene el elemento instalable %s, sin embargo le faltan permisos para instalarlo en este sitio.";
-App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s escribió %2\$s siguiente %3\$s";
-App::$strings["Click to open/close"] = "Pulsar para abrir/cerrar";
-App::$strings["spoiler"] = "spoiler";
-App::$strings["Different viewers will see this text differently"] = "Visitantes diferentes verán este texto de forma distinta";
-App::$strings["$1 wrote:"] = "$1 escribió:";
-App::$strings["%1\$s is now connected with %2\$s"] = "%1\$s ahora está conectado/a con %2\$s";
-App::$strings["%1\$s poked %2\$s"] = "%1\$s ha dado un toque a %2\$s";
-App::$strings["poked"] = "ha dado un toque a";
-App::$strings["View %s's profile @ %s"] = "Ver el perfil @ %s de %s";
-App::$strings["Categories:"] = "Categorías:";
-App::$strings["Filed under:"] = "Archivado bajo:";
-App::$strings["View in context"] = "Mostrar en su contexto";
-App::$strings["remove"] = "eliminar";
-App::$strings["Delete Selected Items"] = "Eliminar elementos seleccionados";
-App::$strings["View Source"] = "Ver la fuente original de la publicación";
-App::$strings["Follow Thread"] = "Seguir este hilo";
-App::$strings["Unfollow Thread"] = "Dejar de seguir este hilo";
-App::$strings["Activity/Posts"] = "Actividad y publicaciones";
-App::$strings["Edit Connection"] = "Editar conexión";
-App::$strings["Message"] = "Mensaje";
-App::$strings["%s likes this."] = "A %s le gusta esto.";
-App::$strings["%s doesn't like this."] = "A %s no le gusta esto.";
-App::$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.",
-);
-App::$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.",
-);
-App::$strings["and"] = "y";
-App::$strings[", and %d other people"] = array(
-	0 => ", y %d persona más",
-	1 => ", y %d personas más",
-);
-App::$strings["%s like this."] = "A %s le gusta esto.";
-App::$strings["%s don't like this."] = "A %s no le gusta esto.";
-App::$strings["Set your location"] = "Establecer su ubicación";
-App::$strings["Clear browser location"] = "Eliminar los datos de localización geográfica del navegador";
-App::$strings["Tag term:"] = "Término de la etiqueta:";
-App::$strings["Where are you right now?"] = "¿Donde está ahora?";
-App::$strings["Page link name"] = "Nombre del enlace de la página";
-App::$strings["Post as"] = "Publicar como";
-App::$strings["Toggle voting"] = "Cambiar votación";
-App::$strings["Categories (optional, comma-separated list)"] = "Categorías (opcional, lista separada por comas)";
-App::$strings["Set publish date"] = "Establecer la fecha de publicación";
-App::$strings["OK"] = "OK";
-App::$strings["Discover"] = "Descubrir";
-App::$strings["Imported public streams"] = "Contenidos públicos importados";
-App::$strings["Commented Order"] = "Comentarios recientes";
-App::$strings["Sort by Comment Date"] = "Ordenar por fecha de comentario";
-App::$strings["Posted Order"] = "Publicaciones recientes";
-App::$strings["Sort by Post Date"] = "Ordenar por fecha de publicación";
-App::$strings["Posts that mention or involve you"] = "Publicaciones que le mencionan o involucran";
-App::$strings["Activity Stream - by date"] = "Contenido - por fecha";
-App::$strings["Starred"] = "Preferidas";
-App::$strings["Favourite Posts"] = "Publicaciones favoritas";
-App::$strings["Spam"] = "Correo basura";
-App::$strings["Posts flagged as SPAM"] = "Publicaciones marcadas como basura";
-App::$strings["Status Messages and Posts"] = "Mensajes de estado y publicaciones";
-App::$strings["About"] = "Mi perfil";
-App::$strings["Profile Details"] = "Detalles del perfil";
-App::$strings["Files and Storage"] = "Ficheros y repositorio";
-App::$strings["Saved Bookmarks"] = "Marcadores guardados";
-App::$strings["Manage Webpages"] = "Administrar páginas web";
-App::$strings["__ctx:noun__ Attending"] = array(
-	0 => "Participaré",
-	1 => "Participaré",
-);
-App::$strings["__ctx:noun__ Not Attending"] = array(
-	0 => "No participaré",
-	1 => "No participaré",
-);
-App::$strings["__ctx:noun__ Undecided"] = array(
-	0 => "Indeciso/a",
-	1 => "Indecisos/as",
-);
-App::$strings["__ctx:noun__ Agree"] = array(
-	0 => "De acuerdo",
-	1 => "De acuerdo",
-);
-App::$strings["__ctx:noun__ Disagree"] = array(
-	0 => "En desacuerdo",
-	1 => "En desacuerdo",
-);
-App::$strings["__ctx:noun__ Abstain"] = array(
-	0 => "se abstiene",
-	1 => "Se abstienen",
-);
 App::$strings["prev"] = "anterior";
 App::$strings["first"] = "primera";
 App::$strings["last"] = "última";
@@ -2093,23 +2124,10 @@ App::$strings["Select an alternate language"] = "Seleccionar un idioma alternati
 App::$strings["activity"] = "la actividad";
 App::$strings["Design Tools"] = "Herramientas de diseño web";
 App::$strings["Pages"] = "Páginas";
-App::$strings["Not a valid email address"] = "Dirección de correo no válida";
-App::$strings["Your email domain is not among those allowed on this site"] = "Su dirección de correo no pertenece a ninguno de los dominios permitidos en este sitio.";
-App::$strings["Your email address is already registered at this site."] = "Su dirección de correo está ya registrada en este sitio.";
-App::$strings["An invitation is required."] = "Es obligatorio que le inviten.";
-App::$strings["Invitation could not be verified."] = "No se ha podido verificar su invitación.";
-App::$strings["Please enter the required information."] = "Por favor introduzca la información requerida.";
-App::$strings["Failed to store account information."] = "La información de la cuenta no se ha podido guardar.";
-App::$strings["Registration confirmation for %s"] = "Confirmación de registro para %s";
-App::$strings["Registration request at %s"] = "Solicitud de registro en %s";
-App::$strings["your registration password"] = "su contraseña de registro";
-App::$strings["Registration details for %s"] = "Detalles del registro de %s";
-App::$strings["Account approved."] = "Cuenta aprobada.";
-App::$strings["Registration revoked for %s"] = "Registro revocado para %s";
-App::$strings["Account verified. Please login."] = "Cuenta verificada. Por favor, inicie sesión.";
-App::$strings["Click here to upgrade."] = "Pulse aquí para actualizar";
-App::$strings["This action exceeds the limits set by your subscription plan."] = "Esta acción supera los límites establecidos por su plan de suscripción ";
-App::$strings["This action is not available under your subscription plan."] = "Esta acción no está disponible en su plan de suscripción.";
+App::$strings["Invalid data packet"] = "Paquete de datos no válido";
+App::$strings["Unable to verify channel signature"] = "No ha sido posible de verificar la firma del canal";
+App::$strings["Unable to verify site signature for %s"] = "No ha sido posible de verificar la firma del sitio para %s";
+App::$strings["invalid target signature"] = "La firma recibida no es válida";
 App::$strings["Tags"] = "Etiquetas";
 App::$strings["Keywords"] = "Palabras clave";
 App::$strings["have"] = "tener";
@@ -2118,20 +2136,6 @@ App::$strings["want"] = "quiero";
 App::$strings["wants"] = "quiere";
 App::$strings["likes"] = "gusta de";
 App::$strings["dislikes"] = "no gusta de";
-App::$strings["Visible to your default audience"] = "Visible para su público predeterminado.";
-App::$strings["Only me"] = "Sólo yo";
-App::$strings["Public"] = "Público";
-App::$strings["Anybody in the \$Projectname network"] = "Cualquiera en la red \$Projectname";
-App::$strings["Any account on %s"] = "Cualquier cuenta en %s";
-App::$strings["Any of my connections"] = "Cualquiera de mis conexiones";
-App::$strings["Only connections I specifically allow"] = "Sólo las conexiones que yo permita de forma explícita";
-App::$strings["Anybody authenticated (could include visitors from other networks)"] = "Cualquiera que se haya autenticado (podría incluir a los visitantes de otras redes)";
-App::$strings["Any connections including those who haven't yet been approved"] = "Cualquier conexión incluyendo aquellas que aún no han sido aprobadas";
-App::$strings["This is your default setting for the audience of your normal stream, and posts."] = "Esta es la configuración predeterminada para su flujo (stream) habitual de publicaciones.";
-App::$strings["This is your default setting for who can view your default channel profile"] = "Esta es su configuración por defecto para establecer quién puede ver su perfil del canal predeterminado";
-App::$strings["This is your default setting for who can view your connections"] = "Este es su ajuste predeterminado para establecer quién puede ver sus conexiones";
-App::$strings["This is your default setting for who can view your file storage and photos"] = "Este es su ajuste predeterminado para establecer quién puede ver su repositorio de ficheros y sus fotos";
-App::$strings["This is your default setting for the audience of your webpages"] = "Este es el ajuste predeterminado para establecer la audiencia de sus páginas web";
 App::$strings["Delete this item?"] = "¿Borrar este elemento?";
 App::$strings["[-] show less"] = "[-] mostrar menos";
 App::$strings["[+] expand"] = "[+] expandir";
@@ -2190,21 +2194,27 @@ App::$strings["__ctx:calendar__ month"] = "mes";
 App::$strings["__ctx:calendar__ week"] = "semana";
 App::$strings["__ctx:calendar__ day"] = "día";
 App::$strings["__ctx:calendar__ All day"] = "Todos los días";
-App::$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.";
-App::$strings["Channel clone failed. Import failed."] = "La clonación del canal no ha salido bien. La importación ha fallado.";
-App::$strings["(Unknown)"] = "(Desconocido)";
-App::$strings["Visible to anybody on the internet."] = "Visible para cualquiera en internet.";
-App::$strings["Visible to you only."] = "Visible sólo para usted.";
-App::$strings["Visible to anybody in this network."] = "Visible para cualquiera en esta red.";
-App::$strings["Visible to anybody authenticated."] = "Visible para cualquiera que haya sido autenticado.";
-App::$strings["Visible to anybody on %s."] = "Visible para cualquiera en %s.";
-App::$strings["Visible to all connections."] = "Visible para todas las conexiones.";
-App::$strings["Visible to approved connections."] = "Visible para las conexiones permitidas.";
-App::$strings["Visible to specific connections."] = "Visible para conexiones específicas.";
-App::$strings["Privacy group is empty."] = "El grupo de canales está vacío.";
-App::$strings["Privacy group: %s"] = "Grupo de canales: %s";
-App::$strings["Connection not found."] = "Conexión no encontrada";
-App::$strings["profile photo"] = "foto del perfil";
+App::$strings["Public"] = "Público";
+App::$strings["Anybody in the \$Projectname network"] = "Cualquiera en la red \$Projectname";
+App::$strings["Any account on %s"] = "Cualquier cuenta en %s";
+App::$strings["Any of my connections"] = "Cualquiera de mis conexiones";
+App::$strings["Only connections I specifically allow"] = "Sólo las conexiones que yo permita de forma explícita";
+App::$strings["Anybody authenticated (could include visitors from other networks)"] = "Cualquiera que esté autenticado (podría incluir a los visitantes de otras redes)";
+App::$strings["Any connections including those who haven't yet been approved"] = "Cualquier conexión incluyendo aquellas que aún no han sido aprobadas";
+App::$strings["This is your default setting for the audience of your normal stream, and posts."] = "Esta es la configuración predeterminada para su flujo (stream) habitual de publicaciones.";
+App::$strings["This is your default setting for who can view your default channel profile"] = "Esta es su configuración por defecto para establecer quién puede ver su perfil del canal predeterminado";
+App::$strings["This is your default setting for who can view your connections"] = "Este es su ajuste predeterminado para establecer quién puede ver sus conexiones";
+App::$strings["This is your default setting for who can view your file storage and photos"] = "Este es su ajuste predeterminado para establecer quién puede ver su repositorio de ficheros y sus fotos";
+App::$strings["This is your default setting for the audience of your webpages"] = "Este es el ajuste predeterminado para establecer la audiencia de sus páginas web";
+App::$strings[" and "] = "  y ";
+App::$strings["public profile"] = "el perfil público";
+App::$strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s ha cambiado %2\$s a &ldquo;%3\$s&rdquo;";
+App::$strings["Visit %1\$s's %2\$s"] = "Visitar %2\$s de %1\$s";
+App::$strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s ha actualizado %2\$s, cambiando %3\$s.";
+App::$strings["Directory Options"] = "Opciones del directorio";
+App::$strings["Safe Mode"] = "Modo seguro";
+App::$strings["Public Forums Only"] = "Solo foros públicos";
+App::$strings["This Website Only"] = "Solo este sitio web";
 App::$strings["New Page"] = "Nueva página";
 App::$strings["Title"] = "Título";
 App::$strings["Can view my normal stream and posts"] = "Pueden verse mi actividad y publicaciones normales";
@@ -2242,28 +2252,8 @@ App::$strings["Special Purpose"] = "Propósito especial";
 App::$strings["Special - Celebrity/Soapbox"] = "Especial - Celebridad / Tribuna improvisada";
 App::$strings["Special - Group Repository"] = "Especial - Repositorio de grupo";
 App::$strings["Custom/Expert Mode"] = "Modo personalizado/experto";
-App::$strings["Site Admin"] = "Administrador del sitio";
-App::$strings["Bug Report"] = "Informe de errores";
-App::$strings["View Bookmarks"] = "Ver los marcadores";
-App::$strings["My Chatrooms"] = "Mis salas de chat";
-App::$strings["Firefox Share"] = "Servicio de compartición de Firefox";
-App::$strings["Remote Diagnostics"] = "Diagnóstico remoto";
-App::$strings["Probe"] = "Probar";
-App::$strings["Suggest"] = "Sugerir";
-App::$strings["Random Channel"] = "Canal aleatorio";
-App::$strings["Invite"] = "Invitar";
-App::$strings["Post"] = "Publicación";
-App::$strings["Purchase"] = "Comprar";
 App::$strings["Attachments:"] = "Ficheros adjuntos:";
 App::$strings["\$Projectname event notification:"] = "Notificación de eventos de \$Projectname:";
-App::$strings["Add others"] = "Añadir otros";
-App::$strings["Who can see this?"] = "¿Quién puede ver esto?";
-App::$strings["Custom selection"] = "Selección personalizada";
-App::$strings["Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit the scope of \"Show\"."] = "Seleccione \"Mostrar\" para permitir la visualización. La opción \"No mostrar\" le permite anular y limitar el alcance de \"Mostrar\".";
-App::$strings["Show"] = "Mostrar";
-App::$strings["Don't show"] = "No mostrar";
-App::$strings["Other networks and post services"] = "Otras redes y servicios de publicación";
-App::$strings["Post permissions %s cannot be changed %s after a post is shared.</br />These permissions set who is allowed to view the post."] = "Los permisos de la entrada %s no se pueden cambiar %s una vez que se ha compartido.</br /> Estos permisos establecen quién está autorizado para ver el mensaje.";
 App::$strings["Focus (Hubzilla default)"] = "Focus (predefinido)";
 App::$strings["Theme settings"] = "Ajustes del tema";
 App::$strings["Select scheme"] = "Elegir un esquema";
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js
index 33d825b55..59a9ed355 100644
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
@@ -183,7 +183,7 @@ function string2bb(element) {
 		};
 
 		smilies = {
-			match: /(^|\s)(:[a-z]{2,})$/,
+			match: /(^|\s)(:[a-z_:]{2,})$/,
 			index: 2,
 			search: function(term, callback) { $.getJSON('/smilies/json').done(function(data) { callback($.map(data, function(entry) { return entry.text.indexOf(term) === 0 ? entry : null; })); }); },
 			template: function(item) { return item.icon + item.text; },
diff --git a/view/nl/hmessages.po b/view/nl/hmessages.po
index 81a670943..4e0a24501 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-05-20 00:02-0700\n"
-"PO-Revision-Date: 2016-05-22 21:10+0000\n"
+"POT-Creation-Date: 2016-06-03 00:02-0700\n"
+"PO-Revision-Date: 2016-06-04 12:33+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"
@@ -22,7 +22,7 @@ msgstr ""
 msgid "parent"
 msgstr "omhoog"
 
-#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2632
+#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2605
 msgid "Collection"
 msgstr "map"
 
@@ -47,15 +47,15 @@ msgid "Schedule Outbox"
 msgstr "Planning-postvak UIT"
 
 #: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Module/Photos.php:798
-#: ../../Zotlabs/Module/Photos.php:1243 ../../include/widgets.php:1506
-#: ../../include/conversation.php:1037 ../../include/apps.php:441
-#: ../../include/apps.php:516
+#: ../../Zotlabs/Module/Photos.php:1243 ../../Zotlabs/Lib/Apps.php:486
+#: ../../Zotlabs/Lib/Apps.php:561 ../../include/conversation.php:1032
+#: ../../include/widgets.php:1503
 msgid "Unknown"
 msgstr "Onbekend"
 
 #: ../../Zotlabs/Storage/Browser.php:226 ../../Zotlabs/Module/Fbrowser.php:85
-#: ../../include/nav.php:93 ../../include/conversation.php:1645
-#: ../../include/apps.php:167
+#: ../../Zotlabs/Lib/Apps.php:216 ../../include/conversation.php:1639
+#: ../../include/nav.php:93
 msgid "Files"
 msgstr "Bestanden"
 
@@ -67,22 +67,22 @@ msgstr "Totaal"
 msgid "Shared"
 msgstr "Gedeeld"
 
-#: ../../Zotlabs/Storage/Browser.php:230 ../../Zotlabs/Storage/Browser.php:305
+#: ../../Zotlabs/Storage/Browser.php:230 ../../Zotlabs/Storage/Browser.php:306
 #: ../../Zotlabs/Module/Blocks.php:156 ../../Zotlabs/Module/Layouts.php:182
 #: ../../Zotlabs/Module/Menu.php:118 ../../Zotlabs/Module/New_channel.php:142
 #: ../../Zotlabs/Module/Webpages.php:186
 msgid "Create"
 msgstr "Aanmaken"
 
-#: ../../Zotlabs/Storage/Browser.php:231 ../../Zotlabs/Storage/Browser.php:307
+#: ../../Zotlabs/Storage/Browser.php:231 ../../Zotlabs/Storage/Browser.php:308
 #: ../../Zotlabs/Module/Cover_photo.php:357
-#: ../../Zotlabs/Module/Photos.php:825 ../../Zotlabs/Module/Photos.php:1367
-#: ../../Zotlabs/Module/Profile_photo.php:368 ../../include/widgets.php:1519
+#: ../../Zotlabs/Module/Photos.php:825 ../../Zotlabs/Module/Photos.php:1368
+#: ../../Zotlabs/Module/Profile_photo.php:368 ../../include/widgets.php:1516
 msgid "Upload"
 msgstr "Uploaden"
 
-#: ../../Zotlabs/Storage/Browser.php:235 ../../Zotlabs/Module/Admin.php:1208
-#: ../../Zotlabs/Module/Chat.php:245 ../../Zotlabs/Module/Settings.php:592
+#: ../../Zotlabs/Storage/Browser.php:235 ../../Zotlabs/Module/Admin.php:1204
+#: ../../Zotlabs/Module/Chat.php:247 ../../Zotlabs/Module/Settings.php:592
 #: ../../Zotlabs/Module/Settings.php:618
 #: ../../Zotlabs/Module/Sharedwithme.php:99
 msgid "Name"
@@ -93,7 +93,7 @@ msgid "Type"
 msgstr "Type"
 
 #: ../../Zotlabs/Storage/Browser.php:237
-#: ../../Zotlabs/Module/Sharedwithme.php:101 ../../include/text.php:1322
+#: ../../Zotlabs/Module/Sharedwithme.php:101 ../../include/text.php:1329
 msgid "Size"
 msgstr "Grootte"
 
@@ -102,7 +102,7 @@ msgstr "Grootte"
 msgid "Last Modified"
 msgstr "Laatst gewijzigd"
 
-#: ../../Zotlabs/Storage/Browser.php:240 ../../Zotlabs/Module/Admin.php:2089
+#: ../../Zotlabs/Storage/Browser.php:240 ../../Zotlabs/Module/Admin.php:2093
 #: ../../Zotlabs/Module/Blocks.php:157
 #: ../../Zotlabs/Module/Connections.php:290
 #: ../../Zotlabs/Module/Connections.php:310
@@ -112,59 +112,60 @@ msgstr "Laatst gewijzigd"
 #: ../../Zotlabs/Module/Editwebpage.php:146
 #: ../../Zotlabs/Module/Layouts.php:190 ../../Zotlabs/Module/Menu.php:112
 #: ../../Zotlabs/Module/Settings.php:652 ../../Zotlabs/Module/Thing.php:260
-#: ../../Zotlabs/Module/Webpages.php:187 ../../include/identity.php:937
-#: ../../include/identity.php:941 ../../include/ItemObject.php:100
-#: ../../include/menu.php:108 ../../include/page_widgets.php:8
-#: ../../include/page_widgets.php:36 ../../include/apps.php:291
+#: ../../Zotlabs/Module/Webpages.php:187 ../../Zotlabs/Lib/Apps.php:337
+#: ../../Zotlabs/Lib/ThreadItem.php:96 ../../include/channel.php:937
+#: ../../include/channel.php:941 ../../include/menu.php:108
+#: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36
 msgid "Edit"
 msgstr "Bewerken"
 
-#: ../../Zotlabs/Storage/Browser.php:241 ../../Zotlabs/Module/Admin.php:1043
-#: ../../Zotlabs/Module/Admin.php:1202 ../../Zotlabs/Module/Admin.php:2090
+#: ../../Zotlabs/Storage/Browser.php:241 ../../Zotlabs/Module/Admin.php:1041
+#: ../../Zotlabs/Module/Admin.php:1198 ../../Zotlabs/Module/Admin.php:2094
 #: ../../Zotlabs/Module/Blocks.php:159
 #: ../../Zotlabs/Module/Connections.php:263
-#: ../../Zotlabs/Module/Connedit.php:573
+#: ../../Zotlabs/Module/Connedit.php:572
 #: ../../Zotlabs/Module/Editblock.php:134
 #: ../../Zotlabs/Module/Editlayout.php:136
 #: ../../Zotlabs/Module/Editwebpage.php:170 ../../Zotlabs/Module/Group.php:177
 #: ../../Zotlabs/Module/Photos.php:1173 ../../Zotlabs/Module/Settings.php:653
 #: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Module/Webpages.php:189
-#: ../../include/ItemObject.php:120 ../../include/conversation.php:657
-#: ../../include/apps.php:292
+#: ../../Zotlabs/Lib/Apps.php:338 ../../Zotlabs/Lib/ThreadItem.php:116
+#: ../../include/conversation.php:657
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: ../../Zotlabs/Storage/Browser.php:284
+#: ../../Zotlabs/Storage/Browser.php:285
 #, php-format
 msgid "You are using %1$s of your available file storage."
 msgstr "Je gebruikt %1$s van de beschikbare bestandsopslag."
 
-#: ../../Zotlabs/Storage/Browser.php:289
+#: ../../Zotlabs/Storage/Browser.php:290
 #, php-format
 msgid "You are using %1$s of %2$s available file storage. (%3$s&#37;)"
 msgstr "Je gebruikt %1$s van totaal %2$s beschikbare bestandsopslag. (%3$s&#37;)"
 
-#: ../../Zotlabs/Storage/Browser.php:301
+#: ../../Zotlabs/Storage/Browser.php:302
 msgid "WARNING:"
 msgstr "WAARSCHUWING:"
 
-#: ../../Zotlabs/Storage/Browser.php:304
+#: ../../Zotlabs/Storage/Browser.php:305
 msgid "Create new folder"
 msgstr "Nieuwe map aanmaken"
 
-#: ../../Zotlabs/Storage/Browser.php:306
+#: ../../Zotlabs/Storage/Browser.php:307
 msgid "Upload file"
 msgstr "Bestand uploaden"
 
-#: ../../Zotlabs/Web/Router.php:65 ../../Zotlabs/Module/Achievements.php:34
-#: ../../Zotlabs/Module/Api.php:13 ../../Zotlabs/Module/Api.php:18
-#: ../../Zotlabs/Module/Appman.php:74 ../../Zotlabs/Module/Authtest.php:16
-#: ../../Zotlabs/Module/Block.php:26 ../../Zotlabs/Module/Block.php:76
-#: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80
-#: ../../Zotlabs/Module/Bookmarks.php:61 ../../Zotlabs/Module/Channel.php:105
-#: ../../Zotlabs/Module/Channel.php:225 ../../Zotlabs/Module/Channel.php:265
-#: ../../Zotlabs/Module/Chat.php:98 ../../Zotlabs/Module/Chat.php:103
-#: ../../Zotlabs/Module/Common.php:39 ../../Zotlabs/Module/Connections.php:33
+#: ../../Zotlabs/Web/Router.php:65 ../../Zotlabs/Web/WebServer.php:121
+#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Api.php:13
+#: ../../Zotlabs/Module/Api.php:18 ../../Zotlabs/Module/Appman.php:75
+#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Block.php:26
+#: ../../Zotlabs/Module/Block.php:76 ../../Zotlabs/Module/Blocks.php:73
+#: ../../Zotlabs/Module/Blocks.php:80 ../../Zotlabs/Module/Bookmarks.php:61
+#: ../../Zotlabs/Module/Channel.php:105 ../../Zotlabs/Module/Channel.php:226
+#: ../../Zotlabs/Module/Channel.php:267 ../../Zotlabs/Module/Chat.php:100
+#: ../../Zotlabs/Module/Chat.php:105 ../../Zotlabs/Module/Common.php:39
+#: ../../Zotlabs/Module/Connections.php:33
 #: ../../Zotlabs/Module/Connedit.php:366
 #: ../../Zotlabs/Module/Cover_photo.php:277
 #: ../../Zotlabs/Module/Cover_photo.php:290
@@ -178,16 +179,15 @@ msgstr "Bestand uploaden"
 #: ../../Zotlabs/Module/Events.php:265 ../../Zotlabs/Module/Filestorage.php:24
 #: ../../Zotlabs/Module/Filestorage.php:79
 #: ../../Zotlabs/Module/Filestorage.php:94
-#: ../../Zotlabs/Module/Filestorage.php:121
-#: ../../Zotlabs/Module/Fsuggest.php:82 ../../Zotlabs/Module/Group.php:13
+#: ../../Zotlabs/Module/Filestorage.php:121 ../../Zotlabs/Module/Group.php:13
 #: ../../Zotlabs/Module/Id.php:76 ../../Zotlabs/Module/Invite.php:17
 #: ../../Zotlabs/Module/Invite.php:91 ../../Zotlabs/Module/Item.php:210
 #: ../../Zotlabs/Module/Item.php:218 ../../Zotlabs/Module/Item.php:1070
 #: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78
 #: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Like.php:181
-#: ../../Zotlabs/Module/Locs.php:87 ../../Zotlabs/Module/Mail.php:130
+#: ../../Zotlabs/Module/Locs.php:87 ../../Zotlabs/Module/Mail.php:129
 #: ../../Zotlabs/Module/Manage.php:10 ../../Zotlabs/Module/Menu.php:78
-#: ../../Zotlabs/Module/Message.php:20 ../../Zotlabs/Module/Mitem.php:115
+#: ../../Zotlabs/Module/Message.php:18 ../../Zotlabs/Module/Mitem.php:115
 #: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Network.php:17
 #: ../../Zotlabs/Module/New_channel.php:77
 #: ../../Zotlabs/Module/New_channel.php:104
@@ -197,26 +197,26 @@ msgstr "Bestand uploaden"
 #: ../../Zotlabs/Module/Profile.php:68 ../../Zotlabs/Module/Profile.php:76
 #: ../../Zotlabs/Module/Profile_photo.php:256
 #: ../../Zotlabs/Module/Profile_photo.php:269
-#: ../../Zotlabs/Module/Profiles.php:202 ../../Zotlabs/Module/Profiles.php:600
+#: ../../Zotlabs/Module/Profiles.php:203 ../../Zotlabs/Module/Profiles.php:601
 #: ../../Zotlabs/Module/Rate.php:113 ../../Zotlabs/Module/Register.php:77
 #: ../../Zotlabs/Module/Regmod.php:21
 #: ../../Zotlabs/Module/Service_limits.php:11
-#: ../../Zotlabs/Module/Settings.php:572 ../../Zotlabs/Module/Setup.php:238
+#: ../../Zotlabs/Module/Settings.php:572 ../../Zotlabs/Module/Setup.php:215
 #: ../../Zotlabs/Module/Sharedwithme.php:11
 #: ../../Zotlabs/Module/Sources.php:74 ../../Zotlabs/Module/Suggest.php:30
 #: ../../Zotlabs/Module/Thing.php:274 ../../Zotlabs/Module/Thing.php:294
 #: ../../Zotlabs/Module/Thing.php:331
-#: ../../Zotlabs/Module/Viewconnections.php:26
-#: ../../Zotlabs/Module/Viewconnections.php:31
+#: ../../Zotlabs/Module/Viewconnections.php:25
+#: ../../Zotlabs/Module/Viewconnections.php:30
 #: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Webpages.php:74
-#: ../../include/chat.php:133 ../../include/photos.php:29
+#: ../../Zotlabs/Lib/Chatroom.php:137 ../../include/photos.php:27
 #: ../../include/attach.php:141 ../../include/attach.php:189
 #: ../../include/attach.php:252 ../../include/attach.php:266
 #: ../../include/attach.php:273 ../../include/attach.php:338
 #: ../../include/attach.php:352 ../../include/attach.php:359
 #: ../../include/attach.php:437 ../../include/attach.php:895
 #: ../../include/attach.php:966 ../../include/attach.php:1118
-#: ../../include/items.php:3439 ../../index.php:175
+#: ../../include/items.php:3440
 msgid "Permission denied."
 msgstr "Toegang geweigerd."
 
@@ -225,18 +225,26 @@ msgid "Not Found"
 msgstr "Niet gevonden"
 
 #: ../../Zotlabs/Web/Router.php:149 ../../Zotlabs/Module/Block.php:79
-#: ../../Zotlabs/Module/Display.php:121 ../../Zotlabs/Module/Help.php:97
+#: ../../Zotlabs/Module/Display.php:117 ../../Zotlabs/Module/Help.php:97
 #: ../../Zotlabs/Module/Page.php:93
 msgid "Page not found."
 msgstr "Pagina niet gevonden."
 
-#: ../../Zotlabs/Zot/Auth.php:140
+#: ../../Zotlabs/Web/WebServer.php:120 ../../Zotlabs/Module/Dreport.php:10
+#: ../../Zotlabs/Module/Dreport.php:49 ../../Zotlabs/Module/Group.php:72
+#: ../../Zotlabs/Module/Import_items.php:112 ../../Zotlabs/Module/Like.php:284
+#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:62
+#: ../../include/items.php:385
+msgid "Permission denied"
+msgstr "Toegang geweigerd"
+
+#: ../../Zotlabs/Zot/Auth.php:138
 msgid ""
 "Remote authentication blocked. You are logged into this site locally. Please"
 " logout and retry."
 msgstr "Authenticatie op afstand geblokkeerd. Je bent lokaal op deze hub ingelogd. Uitloggen en opnieuw proberen."
 
-#: ../../Zotlabs/Zot/Auth.php:248 ../../Zotlabs/Module/Openid.php:76
+#: ../../Zotlabs/Zot/Auth.php:246 ../../Zotlabs/Module/Openid.php:76
 #: ../../Zotlabs/Module/Openid.php:183
 #, php-format
 msgid "Welcome %s. Remote authentication successful."
@@ -248,7 +256,7 @@ msgstr "Welkom %s. Authenticatie op afstand geslaagd."
 #: ../../Zotlabs/Module/Editwebpage.php:33
 #: ../../Zotlabs/Module/Filestorage.php:60 ../../Zotlabs/Module/Hcard.php:12
 #: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Profile.php:20
-#: ../../Zotlabs/Module/Webpages.php:34 ../../include/identity.php:837
+#: ../../Zotlabs/Module/Webpages.php:34 ../../include/channel.php:837
 msgid "Requested profile is not available."
 msgstr "Opgevraagd profiel is niet beschikbaar"
 
@@ -268,10 +276,10 @@ msgstr "RSS"
 msgid "Theme settings updated."
 msgstr "Thema-instellingen bijgewerkt."
 
-#: ../../Zotlabs/Module/Admin.php:164 ../../Zotlabs/Module/Admin.php:1239
-#: ../../Zotlabs/Module/Admin.php:1543 ../../Zotlabs/Module/Display.php:44
+#: ../../Zotlabs/Module/Admin.php:164 ../../Zotlabs/Module/Admin.php:1235
+#: ../../Zotlabs/Module/Admin.php:1541 ../../Zotlabs/Module/Display.php:40
 #: ../../Zotlabs/Module/Filestorage.php:33 ../../Zotlabs/Module/Thing.php:89
-#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:3360
+#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:3361
 msgid "Item not found."
 msgstr "Item niet gevonden."
 
@@ -313,10 +321,10 @@ msgstr "Jouw software moet worden bijgewerkt "
 
 #: ../../Zotlabs/Module/Admin.php:241 ../../Zotlabs/Module/Admin.php:490
 #: ../../Zotlabs/Module/Admin.php:711 ../../Zotlabs/Module/Admin.php:755
-#: ../../Zotlabs/Module/Admin.php:1034 ../../Zotlabs/Module/Admin.php:1198
-#: ../../Zotlabs/Module/Admin.php:1313 ../../Zotlabs/Module/Admin.php:1403
-#: ../../Zotlabs/Module/Admin.php:1594 ../../Zotlabs/Module/Admin.php:1628
-#: ../../Zotlabs/Module/Admin.php:1713
+#: ../../Zotlabs/Module/Admin.php:1032 ../../Zotlabs/Module/Admin.php:1194
+#: ../../Zotlabs/Module/Admin.php:1309 ../../Zotlabs/Module/Admin.php:1399
+#: ../../Zotlabs/Module/Admin.php:1592 ../../Zotlabs/Module/Admin.php:1626
+#: ../../Zotlabs/Module/Admin.php:1711
 msgid "Administration"
 msgstr "Beheer"
 
@@ -356,7 +364,7 @@ msgstr "Versie repository (dev)"
 msgid "Site settings updated."
 msgstr "Hub-instellingen bijgewerkt."
 
-#: ../../Zotlabs/Module/Admin.php:400 ../../include/text.php:2853
+#: ../../Zotlabs/Module/Admin.php:400 ../../include/text.php:2826
 msgid "Default"
 msgstr "Standaard"
 
@@ -373,7 +381,7 @@ msgid "unsupported"
 msgstr "Niet ondersteund"
 
 #: ../../Zotlabs/Module/Admin.php:459 ../../Zotlabs/Module/Api.php:89
-#: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Connedit.php:657
+#: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Connedit.php:654
 #: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:460
 #: ../../Zotlabs/Module/Events.php:469
 #: ../../Zotlabs/Module/Filestorage.php:157
@@ -381,11 +389,11 @@ msgstr "Niet ondersteund"
 #: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Mitem.php:158
 #: ../../Zotlabs/Module/Mitem.php:159 ../../Zotlabs/Module/Mitem.php:232
 #: ../../Zotlabs/Module/Mitem.php:233 ../../Zotlabs/Module/Photos.php:666
-#: ../../Zotlabs/Module/Profiles.php:651 ../../Zotlabs/Module/Removeme.php:64
-#: ../../Zotlabs/Module/Settings.php:581 ../../include/dir_fns.php:141
-#: ../../include/dir_fns.php:142 ../../include/dir_fns.php:143
+#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Removeme.php:61
+#: ../../Zotlabs/Module/Settings.php:581 ../../include/dir_fns.php:143
+#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145
 #: ../../view/theme/redbasic/php/config.php:105
-#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1633
+#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1699
 msgid "No"
 msgstr "Nee"
 
@@ -401,11 +409,11 @@ msgstr "Ja - met goedkeuring"
 #: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Mitem.php:158
 #: ../../Zotlabs/Module/Mitem.php:159 ../../Zotlabs/Module/Mitem.php:232
 #: ../../Zotlabs/Module/Mitem.php:233 ../../Zotlabs/Module/Photos.php:666
-#: ../../Zotlabs/Module/Profiles.php:651 ../../Zotlabs/Module/Removeme.php:64
-#: ../../Zotlabs/Module/Settings.php:581 ../../include/dir_fns.php:141
-#: ../../include/dir_fns.php:142 ../../include/dir_fns.php:143
+#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Removeme.php:61
+#: ../../Zotlabs/Module/Settings.php:581 ../../include/dir_fns.php:143
+#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145
 #: ../../view/theme/redbasic/php/config.php:105
-#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1633
+#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1699
 msgid "Yes"
 msgstr "Ja"
 
@@ -425,39 +433,38 @@ 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"
 
-#: ../../Zotlabs/Module/Admin.php:491 ../../include/widgets.php:1383
+#: ../../Zotlabs/Module/Admin.php:491 ../../include/widgets.php:1380
 msgid "Site"
 msgstr "Hub-instellingen"
 
 #: ../../Zotlabs/Module/Admin.php:492 ../../Zotlabs/Module/Admin.php:688
-#: ../../Zotlabs/Module/Admin.php:771 ../../Zotlabs/Module/Admin.php:1036
-#: ../../Zotlabs/Module/Admin.php:1200 ../../Zotlabs/Module/Admin.php:1405
-#: ../../Zotlabs/Module/Admin.php:1630 ../../Zotlabs/Module/Admin.php:1715
-#: ../../Zotlabs/Module/Admin.php:2092 ../../Zotlabs/Module/Appman.php:125
-#: ../../Zotlabs/Module/Cal.php:341 ../../Zotlabs/Module/Chat.php:194
-#: ../../Zotlabs/Module/Chat.php:236 ../../Zotlabs/Module/Connect.php:98
-#: ../../Zotlabs/Module/Connedit.php:734 ../../Zotlabs/Module/Events.php:475
+#: ../../Zotlabs/Module/Admin.php:771 ../../Zotlabs/Module/Admin.php:1034
+#: ../../Zotlabs/Module/Admin.php:1196 ../../Zotlabs/Module/Admin.php:1401
+#: ../../Zotlabs/Module/Admin.php:1628 ../../Zotlabs/Module/Admin.php:1713
+#: ../../Zotlabs/Module/Admin.php:2096 ../../Zotlabs/Module/Appman.php:126
+#: ../../Zotlabs/Module/Cal.php:338 ../../Zotlabs/Module/Chat.php:196
+#: ../../Zotlabs/Module/Chat.php:238 ../../Zotlabs/Module/Connect.php:98
+#: ../../Zotlabs/Module/Connedit.php:731 ../../Zotlabs/Module/Events.php:475
 #: ../../Zotlabs/Module/Events.php:672
-#: ../../Zotlabs/Module/Filestorage.php:162
-#: ../../Zotlabs/Module/Fsuggest.php:112 ../../Zotlabs/Module/Group.php:85
-#: ../../Zotlabs/Module/Import.php:546
+#: ../../Zotlabs/Module/Filestorage.php:162 ../../Zotlabs/Module/Group.php:85
+#: ../../Zotlabs/Module/Import.php:550
 #: ../../Zotlabs/Module/Import_items.php:120
 #: ../../Zotlabs/Module/Invite.php:146 ../../Zotlabs/Module/Locs.php:121
-#: ../../Zotlabs/Module/Mail.php:384 ../../Zotlabs/Module/Mitem.php:235
+#: ../../Zotlabs/Module/Mail.php:378 ../../Zotlabs/Module/Mitem.php:235
 #: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Pconfig.php:107
 #: ../../Zotlabs/Module/Pdledit.php:66 ../../Zotlabs/Module/Photos.php:677
 #: ../../Zotlabs/Module/Photos.php:1052 ../../Zotlabs/Module/Photos.php:1092
 #: ../../Zotlabs/Module/Photos.php:1210 ../../Zotlabs/Module/Poke.php:186
-#: ../../Zotlabs/Module/Profiles.php:691 ../../Zotlabs/Module/Rate.php:170
+#: ../../Zotlabs/Module/Profiles.php:687 ../../Zotlabs/Module/Rate.php:170
 #: ../../Zotlabs/Module/Settings.php:590 ../../Zotlabs/Module/Settings.php:703
 #: ../../Zotlabs/Module/Settings.php:731 ../../Zotlabs/Module/Settings.php:754
 #: ../../Zotlabs/Module/Settings.php:842
-#: ../../Zotlabs/Module/Settings.php:1034 ../../Zotlabs/Module/Setup.php:335
-#: ../../Zotlabs/Module/Setup.php:376 ../../Zotlabs/Module/Sources.php:114
+#: ../../Zotlabs/Module/Settings.php:1034 ../../Zotlabs/Module/Setup.php:312
+#: ../../Zotlabs/Module/Setup.php:353 ../../Zotlabs/Module/Sources.php:114
 #: ../../Zotlabs/Module/Sources.php:149 ../../Zotlabs/Module/Thing.php:316
 #: ../../Zotlabs/Module/Thing.php:362 ../../Zotlabs/Module/Xchan.php:15
-#: ../../include/widgets.php:757 ../../include/widgets.php:769
-#: ../../include/ItemObject.php:703 ../../include/js_strings.php:22
+#: ../../Zotlabs/Lib/ThreadItem.php:699 ../../include/widgets.php:757
+#: ../../include/widgets.php:769 ../../include/js_strings.php:22
 #: ../../view/theme/redbasic/php/config.php:99
 msgid "Submit"
 msgstr "Opslaan"
@@ -474,7 +481,7 @@ msgstr "Bestand uploaden"
 msgid "Policies"
 msgstr "Beleid"
 
-#: ../../Zotlabs/Module/Admin.php:496 ../../include/contact_widgets.php:19
+#: ../../Zotlabs/Module/Admin.php:496 ../../include/contact_widgets.php:16
 msgid "Advanced"
 msgstr "Geavanceerd"
 
@@ -768,7 +775,7 @@ msgstr "Beheer - Extra functies"
 msgid "No server found"
 msgstr "Geen hub gevonden"
 
-#: ../../Zotlabs/Module/Admin.php:710 ../../Zotlabs/Module/Admin.php:1048
+#: ../../Zotlabs/Module/Admin.php:710 ../../Zotlabs/Module/Admin.php:1046
 msgid "ID"
 msgstr "ID"
 
@@ -812,7 +819,7 @@ msgid ""
 "embedded content from that site is explicitly blocked."
 msgstr "Alle andere ingesloten (embedded) inhoud wordt gefilterd, <strong>tenzij</strong> ingesloten (embedded) inhoud van een website expliciet wordt geblokkeerd."
 
-#: ../../Zotlabs/Module/Admin.php:756 ../../include/widgets.php:1386
+#: ../../Zotlabs/Module/Admin.php:756 ../../include/widgets.php:1383
 msgid "Security"
 msgstr "Beveiliging"
 
@@ -953,447 +960,447 @@ msgid_plural "%s account blocked/unblocked"
 msgstr[0] "%s account geblokkeerd/gedeblokkeerd"
 msgstr[1] "%s accounts geblokkeerd/gedeblokkeerd"
 
-#: ../../Zotlabs/Module/Admin.php:909
+#: ../../Zotlabs/Module/Admin.php:908
 #, php-format
 msgid "%s account deleted"
 msgid_plural "%s accounts deleted"
 msgstr[0] "%s account verwijderd"
 msgstr[1] "%s accounts verwijderd"
 
-#: ../../Zotlabs/Module/Admin.php:945
+#: ../../Zotlabs/Module/Admin.php:944
 msgid "Account not found"
 msgstr "Account niet gevonden"
 
-#: ../../Zotlabs/Module/Admin.php:957
+#: ../../Zotlabs/Module/Admin.php:955
 #, php-format
 msgid "Account '%s' deleted"
 msgstr "Account '%s' verwijderd"
 
-#: ../../Zotlabs/Module/Admin.php:965
+#: ../../Zotlabs/Module/Admin.php:963
 #, php-format
 msgid "Account '%s' blocked"
 msgstr "Account '%s' geblokkeerd"
 
-#: ../../Zotlabs/Module/Admin.php:973
+#: ../../Zotlabs/Module/Admin.php:971
 #, php-format
 msgid "Account '%s' unblocked"
 msgstr "Account '%s' gedeblokkeerd"
 
-#: ../../Zotlabs/Module/Admin.php:1035 ../../Zotlabs/Module/Admin.php:1047
+#: ../../Zotlabs/Module/Admin.php:1033 ../../Zotlabs/Module/Admin.php:1045
 msgid "Users"
 msgstr "Accounts"
 
-#: ../../Zotlabs/Module/Admin.php:1037 ../../Zotlabs/Module/Admin.php:1201
+#: ../../Zotlabs/Module/Admin.php:1035 ../../Zotlabs/Module/Admin.php:1197
 msgid "select all"
 msgstr "alles selecteren"
 
-#: ../../Zotlabs/Module/Admin.php:1038
+#: ../../Zotlabs/Module/Admin.php:1036
 msgid "User registrations waiting for confirm"
 msgstr "Accounts die op goedkeuring wachten"
 
-#: ../../Zotlabs/Module/Admin.php:1039
+#: ../../Zotlabs/Module/Admin.php:1037
 msgid "Request date"
 msgstr "Tijd/datum verzoek"
 
-#: ../../Zotlabs/Module/Admin.php:1039 ../../Zotlabs/Module/Admin.php:1048
+#: ../../Zotlabs/Module/Admin.php:1037 ../../Zotlabs/Module/Admin.php:1046
 #: ../../Zotlabs/Module/Id.php:17 ../../Zotlabs/Module/Id.php:18
-#: ../../include/contact_selectors.php:81 ../../boot.php:1631
+#: ../../include/network.php:2151 ../../boot.php:1697
 msgid "Email"
 msgstr "E-mail"
 
-#: ../../Zotlabs/Module/Admin.php:1040
+#: ../../Zotlabs/Module/Admin.php:1038
 msgid "No registrations."
 msgstr "Geen verzoeken."
 
-#: ../../Zotlabs/Module/Admin.php:1041
+#: ../../Zotlabs/Module/Admin.php:1039
 #: ../../Zotlabs/Module/Connections.php:275
 msgid "Approve"
 msgstr "Goedkeuren"
 
-#: ../../Zotlabs/Module/Admin.php:1042
+#: ../../Zotlabs/Module/Admin.php:1040
 msgid "Deny"
 msgstr "Afkeuren"
 
-#: ../../Zotlabs/Module/Admin.php:1044 ../../Zotlabs/Module/Connedit.php:541
+#: ../../Zotlabs/Module/Admin.php:1042 ../../Zotlabs/Module/Connedit.php:540
 msgid "Block"
 msgstr "Blokkeren"
 
-#: ../../Zotlabs/Module/Admin.php:1045 ../../Zotlabs/Module/Connedit.php:541
+#: ../../Zotlabs/Module/Admin.php:1043 ../../Zotlabs/Module/Connedit.php:540
 msgid "Unblock"
 msgstr "Deblokkeren"
 
-#: ../../Zotlabs/Module/Admin.php:1048 ../../include/group.php:267
+#: ../../Zotlabs/Module/Admin.php:1046 ../../include/group.php:267
 msgid "All Channels"
 msgstr "Alle kanalen"
 
-#: ../../Zotlabs/Module/Admin.php:1048
+#: ../../Zotlabs/Module/Admin.php:1046
 msgid "Register date"
 msgstr "Geregistreerd"
 
-#: ../../Zotlabs/Module/Admin.php:1048
+#: ../../Zotlabs/Module/Admin.php:1046
 msgid "Last login"
 msgstr "Laatste keer ingelogd"
 
-#: ../../Zotlabs/Module/Admin.php:1048
+#: ../../Zotlabs/Module/Admin.php:1046
 msgid "Expires"
 msgstr "Verloopt"
 
-#: ../../Zotlabs/Module/Admin.php:1048
+#: ../../Zotlabs/Module/Admin.php:1046
 msgid "Service Class"
 msgstr "Abonnementen"
 
-#: ../../Zotlabs/Module/Admin.php:1050
+#: ../../Zotlabs/Module/Admin.php:1048
 msgid ""
 "Selected accounts will be deleted!\\n\\nEverything these accounts had posted"
 " on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Geselecteerde accounts (met bijbehorende kanalen) worden verwijderd!\\n\\nAlles wat deze accounts op deze hub hebben gepubliceerd wordt definitief verwijderd!\\n\\Weet je het zeker?"
 
-#: ../../Zotlabs/Module/Admin.php:1051
+#: ../../Zotlabs/Module/Admin.php:1049
 msgid ""
 "The account {0} will be deleted!\\n\\nEverything this account has posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Account {0} (met bijbehorende kanalen) wordt verwijderd !\\n\\nAlles wat dit account op deze hub heeft gepubliceerd wordt definitief verwijderd!\\n\\nWeet je het zeker?"
 
-#: ../../Zotlabs/Module/Admin.php:1087
+#: ../../Zotlabs/Module/Admin.php:1085
 #, php-format
 msgid "%s channel censored/uncensored"
 msgid_plural "%s channels censored/uncensored"
 msgstr[0] "%s kanaal gecensureerd/ongecensureerd"
 msgstr[1] "%s kanalen gecensureerd/ongecensureerd"
 
-#: ../../Zotlabs/Module/Admin.php:1096
+#: ../../Zotlabs/Module/Admin.php:1094
 #, php-format
 msgid "%s channel code allowed/disallowed"
 msgid_plural "%s channels code allowed/disallowed"
 msgstr[0] "Scripts toegestaan/niet toegestaan voor %s kanaal"
 msgstr[1] "Scripts toegestaan/niet toegestaan voor %s kanalen"
 
-#: ../../Zotlabs/Module/Admin.php:1103
+#: ../../Zotlabs/Module/Admin.php:1100
 #, php-format
 msgid "%s channel deleted"
 msgid_plural "%s channels deleted"
 msgstr[0] "%s kanaal verwijderd"
 msgstr[1] "%s kanalen verwijderd"
 
-#: ../../Zotlabs/Module/Admin.php:1123
+#: ../../Zotlabs/Module/Admin.php:1120
 msgid "Channel not found"
 msgstr "Kanaal niet gevonden"
 
-#: ../../Zotlabs/Module/Admin.php:1134
+#: ../../Zotlabs/Module/Admin.php:1130
 #, php-format
 msgid "Channel '%s' deleted"
 msgstr "Kanaal '%s' verwijderd"
 
-#: ../../Zotlabs/Module/Admin.php:1146
+#: ../../Zotlabs/Module/Admin.php:1142
 #, php-format
 msgid "Channel '%s' censored"
 msgstr "Kanaal '%s' gecensureerd"
 
-#: ../../Zotlabs/Module/Admin.php:1146
+#: ../../Zotlabs/Module/Admin.php:1142
 #, php-format
 msgid "Channel '%s' uncensored"
 msgstr "Kanaal '%s' ongecensureerd"
 
-#: ../../Zotlabs/Module/Admin.php:1157
+#: ../../Zotlabs/Module/Admin.php:1153
 #, php-format
 msgid "Channel '%s' code allowed"
 msgstr "Scripts toegestaan voor kanaal '%s'"
 
-#: ../../Zotlabs/Module/Admin.php:1157
+#: ../../Zotlabs/Module/Admin.php:1153
 #, php-format
 msgid "Channel '%s' code disallowed"
 msgstr "Scripts niet toegestaan voor kanaal '%s'"
 
-#: ../../Zotlabs/Module/Admin.php:1199 ../../include/widgets.php:1385
+#: ../../Zotlabs/Module/Admin.php:1195 ../../include/widgets.php:1382
 msgid "Channels"
 msgstr "Kanalen"
 
-#: ../../Zotlabs/Module/Admin.php:1203
+#: ../../Zotlabs/Module/Admin.php:1199
 msgid "Censor"
 msgstr "Censureren"
 
-#: ../../Zotlabs/Module/Admin.php:1204
+#: ../../Zotlabs/Module/Admin.php:1200
 msgid "Uncensor"
 msgstr "Niet censureren"
 
-#: ../../Zotlabs/Module/Admin.php:1205
+#: ../../Zotlabs/Module/Admin.php:1201
 msgid "Allow Code"
 msgstr "Scripts toestaan"
 
-#: ../../Zotlabs/Module/Admin.php:1206
+#: ../../Zotlabs/Module/Admin.php:1202
 msgid "Disallow Code"
 msgstr "Scripts niet toestaan"
 
-#: ../../Zotlabs/Module/Admin.php:1207 ../../include/conversation.php:1617
+#: ../../Zotlabs/Module/Admin.php:1203 ../../include/conversation.php:1611
 msgid "Channel"
 msgstr "Kanaal"
 
-#: ../../Zotlabs/Module/Admin.php:1208
+#: ../../Zotlabs/Module/Admin.php:1204
 msgid "UID"
 msgstr "UID"
 
-#: ../../Zotlabs/Module/Admin.php:1208 ../../Zotlabs/Module/Locs.php:118
-#: ../../Zotlabs/Module/Profiles.php:469
+#: ../../Zotlabs/Module/Admin.php:1204 ../../Zotlabs/Module/Locs.php:118
+#: ../../Zotlabs/Module/Profiles.php:470
 msgid "Address"
 msgstr "Kanaaladres"
 
-#: ../../Zotlabs/Module/Admin.php:1210
+#: ../../Zotlabs/Module/Admin.php:1206
 msgid ""
 "Selected channels will be deleted!\\n\\nEverything that was posted in these "
 "channels on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Geselecteerde kanalen worden verwijderd!\\n\\nAlles wat in deze kanalen op deze hub werd gepubliceerd wordt definitief verwijderd!\\n\\nWeet je het zeker?"
 
-#: ../../Zotlabs/Module/Admin.php:1211
+#: ../../Zotlabs/Module/Admin.php:1207
 msgid ""
 "The channel {0} will be deleted!\\n\\nEverything that was posted in this "
 "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?"
 
-#: ../../Zotlabs/Module/Admin.php:1268
+#: ../../Zotlabs/Module/Admin.php:1264
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "Plugin %s uitgeschakeld."
 
-#: ../../Zotlabs/Module/Admin.php:1272
+#: ../../Zotlabs/Module/Admin.php:1268
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "Plugin %s ingeschakeld"
 
-#: ../../Zotlabs/Module/Admin.php:1282 ../../Zotlabs/Module/Admin.php:1567
+#: ../../Zotlabs/Module/Admin.php:1278 ../../Zotlabs/Module/Admin.php:1565
 msgid "Disable"
 msgstr "Uitschakelen"
 
-#: ../../Zotlabs/Module/Admin.php:1285 ../../Zotlabs/Module/Admin.php:1569
+#: ../../Zotlabs/Module/Admin.php:1281 ../../Zotlabs/Module/Admin.php:1567
 msgid "Enable"
 msgstr "Inschakelen"
 
-#: ../../Zotlabs/Module/Admin.php:1314 ../../Zotlabs/Module/Admin.php:1404
-#: ../../include/widgets.php:1388
+#: ../../Zotlabs/Module/Admin.php:1310 ../../Zotlabs/Module/Admin.php:1400
+#: ../../include/widgets.php:1385
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../../Zotlabs/Module/Admin.php:1315 ../../Zotlabs/Module/Admin.php:1596
+#: ../../Zotlabs/Module/Admin.php:1311 ../../Zotlabs/Module/Admin.php:1594
 msgid "Toggle"
 msgstr "Omschakelen"
 
-#: ../../Zotlabs/Module/Admin.php:1316 ../../Zotlabs/Module/Admin.php:1597
-#: ../../include/widgets.php:638 ../../include/nav.php:208
-#: ../../include/apps.php:166
+#: ../../Zotlabs/Module/Admin.php:1312 ../../Zotlabs/Module/Admin.php:1595
+#: ../../Zotlabs/Lib/Apps.php:215 ../../include/nav.php:208
+#: ../../include/widgets.php:638
 msgid "Settings"
 msgstr "Instellingen"
 
-#: ../../Zotlabs/Module/Admin.php:1323 ../../Zotlabs/Module/Admin.php:1606
+#: ../../Zotlabs/Module/Admin.php:1319 ../../Zotlabs/Module/Admin.php:1604
 msgid "Author: "
 msgstr "Auteur: "
 
-#: ../../Zotlabs/Module/Admin.php:1324 ../../Zotlabs/Module/Admin.php:1607
+#: ../../Zotlabs/Module/Admin.php:1320 ../../Zotlabs/Module/Admin.php:1605
 msgid "Maintainer: "
 msgstr "Beheerder: "
 
-#: ../../Zotlabs/Module/Admin.php:1325
+#: ../../Zotlabs/Module/Admin.php:1321
 msgid "Minimum project version: "
 msgstr "Minimum versie Hubzilla: "
 
-#: ../../Zotlabs/Module/Admin.php:1326
+#: ../../Zotlabs/Module/Admin.php:1322
 msgid "Maximum project version: "
 msgstr "Maximum versie Hubzilla:"
 
-#: ../../Zotlabs/Module/Admin.php:1327
+#: ../../Zotlabs/Module/Admin.php:1323
 msgid "Minimum PHP version: "
 msgstr "Minimum versie PHP: "
 
-#: ../../Zotlabs/Module/Admin.php:1328
+#: ../../Zotlabs/Module/Admin.php:1324
 msgid "Requires: "
 msgstr "Vereist: "
 
-#: ../../Zotlabs/Module/Admin.php:1329 ../../Zotlabs/Module/Admin.php:1409
+#: ../../Zotlabs/Module/Admin.php:1325 ../../Zotlabs/Module/Admin.php:1405
 msgid "Disabled - version incompatibility"
 msgstr "Uitgeschakeld - versie is incompatibel"
 
-#: ../../Zotlabs/Module/Admin.php:1378
+#: ../../Zotlabs/Module/Admin.php:1374
 msgid "Enter the public git repository URL of the plugin repo."
 msgstr "Vul de openbare Git-URL in van de plugin-repository."
 
-#: ../../Zotlabs/Module/Admin.php:1379
+#: ../../Zotlabs/Module/Admin.php:1375
 msgid "Plugin repo git URL"
 msgstr "Git-URL plugin-repository"
 
-#: ../../Zotlabs/Module/Admin.php:1380
+#: ../../Zotlabs/Module/Admin.php:1376
 msgid "Custom repo name"
 msgstr "Handmatige repository-naam"
 
-#: ../../Zotlabs/Module/Admin.php:1380
+#: ../../Zotlabs/Module/Admin.php:1376
 msgid "(optional)"
 msgstr "(optioneel)"
 
-#: ../../Zotlabs/Module/Admin.php:1381
+#: ../../Zotlabs/Module/Admin.php:1377
 msgid "Download Plugin Repo"
 msgstr "Plugin-repository downloaden"
 
-#: ../../Zotlabs/Module/Admin.php:1388
+#: ../../Zotlabs/Module/Admin.php:1384
 msgid "Install new repo"
 msgstr "Nieuwe repository installeren"
 
-#: ../../Zotlabs/Module/Admin.php:1389 ../../include/apps.php:284
+#: ../../Zotlabs/Module/Admin.php:1385 ../../Zotlabs/Lib/Apps.php:330
 msgid "Install"
 msgstr "Installeren"
 
-#: ../../Zotlabs/Module/Admin.php:1390 ../../Zotlabs/Module/Fbrowser.php:66
+#: ../../Zotlabs/Module/Admin.php:1386 ../../Zotlabs/Module/Fbrowser.php:66
 #: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Settings.php:591
 #: ../../Zotlabs/Module/Settings.php:617 ../../Zotlabs/Module/Tagrm.php:15
-#: ../../Zotlabs/Module/Tagrm.php:138 ../../include/conversation.php:1265
+#: ../../Zotlabs/Module/Tagrm.php:138 ../../include/conversation.php:1259
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: ../../Zotlabs/Module/Admin.php:1411
+#: ../../Zotlabs/Module/Admin.php:1407
 msgid "Manage Repos"
 msgstr "Repositories beheren"
 
-#: ../../Zotlabs/Module/Admin.php:1412
+#: ../../Zotlabs/Module/Admin.php:1408
 msgid "Installed Plugin Repositories"
 msgstr "Toegevoegde plugin-repositories"
 
-#: ../../Zotlabs/Module/Admin.php:1413
+#: ../../Zotlabs/Module/Admin.php:1409
 msgid "Install a New Plugin Repository"
 msgstr "Nieuwe plugin-repository toevoegen"
 
-#: ../../Zotlabs/Module/Admin.php:1419 ../../Zotlabs/Module/Settings.php:77
-#: ../../Zotlabs/Module/Settings.php:616 ../../include/apps.php:284
+#: ../../Zotlabs/Module/Admin.php:1415 ../../Zotlabs/Module/Settings.php:77
+#: ../../Zotlabs/Module/Settings.php:616 ../../Zotlabs/Lib/Apps.php:330
 msgid "Update"
 msgstr "Bijwerken"
 
-#: ../../Zotlabs/Module/Admin.php:1420
+#: ../../Zotlabs/Module/Admin.php:1416
 msgid "Switch branch"
 msgstr "Branch veranderen"
 
-#: ../../Zotlabs/Module/Admin.php:1421 ../../Zotlabs/Module/Photos.php:998
+#: ../../Zotlabs/Module/Admin.php:1417 ../../Zotlabs/Module/Photos.php:998
 #: ../../Zotlabs/Module/Tagrm.php:137
 msgid "Remove"
 msgstr "Verwijderen"
 
-#: ../../Zotlabs/Module/Admin.php:1532
+#: ../../Zotlabs/Module/Admin.php:1530
 msgid "No themes found."
 msgstr "Geen thema's gevonden"
 
-#: ../../Zotlabs/Module/Admin.php:1588
+#: ../../Zotlabs/Module/Admin.php:1586
 msgid "Screenshot"
 msgstr "Schermafdruk"
 
-#: ../../Zotlabs/Module/Admin.php:1595 ../../Zotlabs/Module/Admin.php:1629
-#: ../../include/widgets.php:1389
+#: ../../Zotlabs/Module/Admin.php:1593 ../../Zotlabs/Module/Admin.php:1627
+#: ../../include/widgets.php:1386
 msgid "Themes"
 msgstr "Thema's"
 
-#: ../../Zotlabs/Module/Admin.php:1634
+#: ../../Zotlabs/Module/Admin.php:1632
 msgid "[Experimental]"
 msgstr "[Experimenteel]"
 
-#: ../../Zotlabs/Module/Admin.php:1635
+#: ../../Zotlabs/Module/Admin.php:1633
 msgid "[Unsupported]"
 msgstr "[Niet ondersteund]"
 
-#: ../../Zotlabs/Module/Admin.php:1659
+#: ../../Zotlabs/Module/Admin.php:1657
 msgid "Log settings updated."
 msgstr "Logboek-instellingen bijgewerkt."
 
-#: ../../Zotlabs/Module/Admin.php:1714 ../../include/widgets.php:1410
-#: ../../include/widgets.php:1420
+#: ../../Zotlabs/Module/Admin.php:1712 ../../include/widgets.php:1407
+#: ../../include/widgets.php:1417
 msgid "Logs"
 msgstr "Logboeken"
 
-#: ../../Zotlabs/Module/Admin.php:1716
+#: ../../Zotlabs/Module/Admin.php:1714
 msgid "Clear"
 msgstr "Leegmaken"
 
-#: ../../Zotlabs/Module/Admin.php:1722
+#: ../../Zotlabs/Module/Admin.php:1720
 msgid "Debugging"
 msgstr "Debuggen"
 
-#: ../../Zotlabs/Module/Admin.php:1723
+#: ../../Zotlabs/Module/Admin.php:1721
 msgid "Log file"
 msgstr "Logbestand"
 
-#: ../../Zotlabs/Module/Admin.php:1723
+#: ../../Zotlabs/Module/Admin.php:1721
 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."
 
-#: ../../Zotlabs/Module/Admin.php:1724
+#: ../../Zotlabs/Module/Admin.php:1722
 msgid "Log level"
 msgstr "Logniveau"
 
-#: ../../Zotlabs/Module/Admin.php:2004
+#: ../../Zotlabs/Module/Admin.php:2008
 msgid "New Profile Field"
 msgstr "Nieuw profielveld"
 
-#: ../../Zotlabs/Module/Admin.php:2005 ../../Zotlabs/Module/Admin.php:2025
+#: ../../Zotlabs/Module/Admin.php:2009 ../../Zotlabs/Module/Admin.php:2029
 msgid "Field nickname"
 msgstr "Bijnaam voor veld"
 
-#: ../../Zotlabs/Module/Admin.php:2005 ../../Zotlabs/Module/Admin.php:2025
+#: ../../Zotlabs/Module/Admin.php:2009 ../../Zotlabs/Module/Admin.php:2029
 msgid "System name of field"
 msgstr "Systeemnaam voor veld"
 
-#: ../../Zotlabs/Module/Admin.php:2006 ../../Zotlabs/Module/Admin.php:2026
+#: ../../Zotlabs/Module/Admin.php:2010 ../../Zotlabs/Module/Admin.php:2030
 msgid "Input type"
 msgstr "Invoertype"
 
-#: ../../Zotlabs/Module/Admin.php:2007 ../../Zotlabs/Module/Admin.php:2027
+#: ../../Zotlabs/Module/Admin.php:2011 ../../Zotlabs/Module/Admin.php:2031
 msgid "Field Name"
 msgstr "Veldnaam"
 
-#: ../../Zotlabs/Module/Admin.php:2007 ../../Zotlabs/Module/Admin.php:2027
+#: ../../Zotlabs/Module/Admin.php:2011 ../../Zotlabs/Module/Admin.php:2031
 msgid "Label on profile pages"
 msgstr "Tekstlabel voor op profielpagina's"
 
-#: ../../Zotlabs/Module/Admin.php:2008 ../../Zotlabs/Module/Admin.php:2028
+#: ../../Zotlabs/Module/Admin.php:2012 ../../Zotlabs/Module/Admin.php:2032
 msgid "Help text"
 msgstr "Helptekst"
 
-#: ../../Zotlabs/Module/Admin.php:2008 ../../Zotlabs/Module/Admin.php:2028
+#: ../../Zotlabs/Module/Admin.php:2012 ../../Zotlabs/Module/Admin.php:2032
 msgid "Additional info (optional)"
 msgstr "Extra informatie (optioneel)"
 
-#: ../../Zotlabs/Module/Admin.php:2009 ../../Zotlabs/Module/Admin.php:2029
+#: ../../Zotlabs/Module/Admin.php:2013 ../../Zotlabs/Module/Admin.php:2033
 #: ../../Zotlabs/Module/Filer.php:53 ../../Zotlabs/Module/Rbmark.php:32
 #: ../../Zotlabs/Module/Rbmark.php:104 ../../include/widgets.php:201
-#: ../../include/text.php:934 ../../include/text.php:946
+#: ../../include/text.php:946 ../../include/text.php:958
 msgid "Save"
 msgstr "Opslaan"
 
-#: ../../Zotlabs/Module/Admin.php:2018
+#: ../../Zotlabs/Module/Admin.php:2022
 msgid "Field definition not found"
 msgstr "Velddefinitie niet gevonden"
 
-#: ../../Zotlabs/Module/Admin.php:2024
+#: ../../Zotlabs/Module/Admin.php:2028
 msgid "Edit Profile Field"
 msgstr "Profielveld bewerken"
 
-#: ../../Zotlabs/Module/Admin.php:2082 ../../include/widgets.php:1391
+#: ../../Zotlabs/Module/Admin.php:2086 ../../include/widgets.php:1388
 msgid "Profile Fields"
 msgstr "Profielvelden"
 
-#: ../../Zotlabs/Module/Admin.php:2083
+#: ../../Zotlabs/Module/Admin.php:2087
 msgid "Basic Profile Fields"
 msgstr "Standaard profielvelden"
 
-#: ../../Zotlabs/Module/Admin.php:2084
+#: ../../Zotlabs/Module/Admin.php:2088
 msgid "Advanced Profile Fields"
 msgstr "Geavanceerde profielvelden"
 
-#: ../../Zotlabs/Module/Admin.php:2084
+#: ../../Zotlabs/Module/Admin.php:2088
 msgid "(In addition to basic fields)"
 msgstr "(als toevoeging op de standaard velden)"
 
-#: ../../Zotlabs/Module/Admin.php:2086
+#: ../../Zotlabs/Module/Admin.php:2090
 msgid "All available fields"
 msgstr "Alle beschikbare velden"
 
-#: ../../Zotlabs/Module/Admin.php:2087
+#: ../../Zotlabs/Module/Admin.php:2091
 msgid "Custom Fields"
 msgstr "Extra (handmatig toegevoegde) velden"
 
-#: ../../Zotlabs/Module/Admin.php:2091
+#: ../../Zotlabs/Module/Admin.php:2095
 msgid "Create Custom Field"
 msgstr "Extra velden aanmaken"
 
@@ -1415,72 +1422,72 @@ msgid ""
 " and/or create new posts for you?"
 msgstr "Wil je deze applicatie toestemming geven om jouw berichten en connecties te zien, en/of nieuwe berichten voor jou te plaatsen?"
 
-#: ../../Zotlabs/Module/Appman.php:36 ../../Zotlabs/Module/Appman.php:52
+#: ../../Zotlabs/Module/Appman.php:37 ../../Zotlabs/Module/Appman.php:53
 msgid "App installed."
 msgstr "App geïnstalleerd"
 
-#: ../../Zotlabs/Module/Appman.php:45
+#: ../../Zotlabs/Module/Appman.php:46
 msgid "Malformed app."
 msgstr "Misvormde app."
 
-#: ../../Zotlabs/Module/Appman.php:103
+#: ../../Zotlabs/Module/Appman.php:104
 msgid "Embed code"
 msgstr "Insluitcode"
 
-#: ../../Zotlabs/Module/Appman.php:109 ../../include/widgets.php:107
+#: ../../Zotlabs/Module/Appman.php:110 ../../include/widgets.php:107
 msgid "Edit App"
 msgstr "App bewerken"
 
-#: ../../Zotlabs/Module/Appman.php:109
+#: ../../Zotlabs/Module/Appman.php:110
 msgid "Create App"
 msgstr "App maken"
 
-#: ../../Zotlabs/Module/Appman.php:114
+#: ../../Zotlabs/Module/Appman.php:115
 msgid "Name of app"
 msgstr "Naam van app"
 
-#: ../../Zotlabs/Module/Appman.php:114 ../../Zotlabs/Module/Appman.php:115
+#: ../../Zotlabs/Module/Appman.php:115 ../../Zotlabs/Module/Appman.php:116
 #: ../../Zotlabs/Module/Events.php:449 ../../Zotlabs/Module/Events.php:454
-#: ../../Zotlabs/Module/Profiles.php:713 ../../Zotlabs/Module/Profiles.php:717
-#: ../../include/datetime.php:246
+#: ../../Zotlabs/Module/Profiles.php:709 ../../Zotlabs/Module/Profiles.php:713
+#: ../../include/datetime.php:245
 msgid "Required"
 msgstr "Vereist"
 
-#: ../../Zotlabs/Module/Appman.php:115
+#: ../../Zotlabs/Module/Appman.php:116
 msgid "Location (URL) of app"
 msgstr "Locatie (URL) van app"
 
-#: ../../Zotlabs/Module/Appman.php:116 ../../Zotlabs/Module/Events.php:462
+#: ../../Zotlabs/Module/Appman.php:117 ../../Zotlabs/Module/Events.php:462
 #: ../../Zotlabs/Module/Rbmark.php:101
 msgid "Description"
 msgstr "Omschrijving"
 
-#: ../../Zotlabs/Module/Appman.php:117
+#: ../../Zotlabs/Module/Appman.php:118
 msgid "Photo icon URL"
 msgstr "URL van pictogram"
 
-#: ../../Zotlabs/Module/Appman.php:117
+#: ../../Zotlabs/Module/Appman.php:118
 msgid "80 x 80 pixels - optional"
 msgstr "80 x 80 pixels (optioneel)"
 
-#: ../../Zotlabs/Module/Appman.php:118
+#: ../../Zotlabs/Module/Appman.php:119
 msgid "Categories (optional, comma separated list)"
 msgstr "Categorieën (optioneel,  door komma's gescheiden lijst)"
 
-#: ../../Zotlabs/Module/Appman.php:119
+#: ../../Zotlabs/Module/Appman.php:120
 msgid "Version ID"
 msgstr "Versie-ID"
 
-#: ../../Zotlabs/Module/Appman.php:120
+#: ../../Zotlabs/Module/Appman.php:121
 msgid "Price of app"
 msgstr "Prijs van de app"
 
-#: ../../Zotlabs/Module/Appman.php:121
+#: ../../Zotlabs/Module/Appman.php:122
 msgid "Location (URL) to purchase app"
 msgstr "Locatie (URL) om de app aan te schaffen"
 
-#: ../../Zotlabs/Module/Apps.php:46 ../../include/widgets.php:102
-#: ../../include/nav.php:163
+#: ../../Zotlabs/Module/Apps.php:47 ../../include/nav.php:163
+#: ../../include/widgets.php:102
 msgid "Apps"
 msgstr "Apps"
 
@@ -1492,7 +1499,7 @@ msgstr "Item is niet aanwezig."
 msgid "Invalid item."
 msgstr "Ongeldig item."
 
-#: ../../Zotlabs/Module/Block.php:43 ../../Zotlabs/Module/Cal.php:65
+#: ../../Zotlabs/Module/Block.php:43 ../../Zotlabs/Module/Cal.php:62
 #: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Wall_upload.php:33
 msgid "Channel not found."
 msgstr "Kanaal niet gevonden."
@@ -1502,7 +1509,7 @@ msgstr "Kanaal niet gevonden."
 msgid "Block Name"
 msgstr "Bloknaam"
 
-#: ../../Zotlabs/Module/Blocks.php:151 ../../include/text.php:2277
+#: ../../Zotlabs/Module/Blocks.php:151 ../../include/text.php:2250
 msgid "Blocks"
 msgstr "Blokken"
 
@@ -1524,12 +1531,12 @@ msgstr "Bewerkt"
 
 #: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Layouts.php:191
 #: ../../Zotlabs/Module/Photos.php:1072 ../../Zotlabs/Module/Webpages.php:188
-#: ../../include/conversation.php:1214
+#: ../../include/conversation.php:1208
 msgid "Share"
 msgstr "Delen"
 
 #: ../../Zotlabs/Module/Blocks.php:163 ../../Zotlabs/Module/Layouts.php:195
-#: ../../Zotlabs/Module/Pubsites.php:46 ../../Zotlabs/Module/Webpages.php:193
+#: ../../Zotlabs/Module/Pubsites.php:47 ../../Zotlabs/Module/Webpages.php:193
 #: ../../include/page_widgets.php:39
 msgid "View"
 msgstr "Weergeven"
@@ -1546,54 +1553,54 @@ msgstr "Mijn bladwijzers"
 msgid "My Connections Bookmarks"
 msgstr "Bladwijzers van mijn connecties"
 
-#: ../../Zotlabs/Module/Cal.php:72
+#: ../../Zotlabs/Module/Cal.php:69
 msgid "Permissions denied."
 msgstr "Permissies niet toegestaan"
 
-#: ../../Zotlabs/Module/Cal.php:262 ../../Zotlabs/Module/Events.php:588
+#: ../../Zotlabs/Module/Cal.php:259 ../../Zotlabs/Module/Events.php:588
 msgid "l, F j"
 msgstr "l j F"
 
-#: ../../Zotlabs/Module/Cal.php:311 ../../Zotlabs/Module/Events.php:637
-#: ../../include/text.php:1743
+#: ../../Zotlabs/Module/Cal.php:308 ../../Zotlabs/Module/Events.php:637
+#: ../../include/text.php:1717
 msgid "Link to Source"
 msgstr "Originele locatie"
 
-#: ../../Zotlabs/Module/Cal.php:334 ../../Zotlabs/Module/Events.php:665
+#: ../../Zotlabs/Module/Cal.php:331 ../../Zotlabs/Module/Events.php:665
 msgid "Edit Event"
 msgstr "Gebeurtenis bewerken"
 
-#: ../../Zotlabs/Module/Cal.php:334 ../../Zotlabs/Module/Events.php:665
+#: ../../Zotlabs/Module/Cal.php:331 ../../Zotlabs/Module/Events.php:665
 msgid "Create Event"
 msgstr "Gebeurtenis aanmaken"
 
-#: ../../Zotlabs/Module/Cal.php:335 ../../Zotlabs/Module/Cal.php:342
+#: ../../Zotlabs/Module/Cal.php:332 ../../Zotlabs/Module/Cal.php:339
 #: ../../Zotlabs/Module/Events.php:666 ../../Zotlabs/Module/Events.php:673
 #: ../../Zotlabs/Module/Photos.php:949
 msgid "Previous"
 msgstr "Vorige"
 
-#: ../../Zotlabs/Module/Cal.php:336 ../../Zotlabs/Module/Cal.php:343
+#: ../../Zotlabs/Module/Cal.php:333 ../../Zotlabs/Module/Cal.php:340
 #: ../../Zotlabs/Module/Events.php:667 ../../Zotlabs/Module/Events.php:674
-#: ../../Zotlabs/Module/Photos.php:958 ../../Zotlabs/Module/Setup.php:290
+#: ../../Zotlabs/Module/Photos.php:958 ../../Zotlabs/Module/Setup.php:267
 msgid "Next"
 msgstr "Volgende"
 
-#: ../../Zotlabs/Module/Cal.php:337 ../../Zotlabs/Module/Events.php:668
+#: ../../Zotlabs/Module/Cal.php:334 ../../Zotlabs/Module/Events.php:668
 #: ../../include/widgets.php:755
 msgid "Export"
 msgstr "Exporteren"
 
-#: ../../Zotlabs/Module/Cal.php:340 ../../Zotlabs/Module/Events.php:671
+#: ../../Zotlabs/Module/Cal.php:337 ../../Zotlabs/Module/Events.php:671
 #: ../../include/widgets.php:756
 msgid "Import"
 msgstr "Importeren"
 
-#: ../../Zotlabs/Module/Cal.php:344 ../../Zotlabs/Module/Events.php:675
+#: ../../Zotlabs/Module/Cal.php:341 ../../Zotlabs/Module/Events.php:675
 msgid "Today"
 msgstr "Vandaag"
 
-#: ../../Zotlabs/Module/Channel.php:29 ../../Zotlabs/Module/Chat.php:23
+#: ../../Zotlabs/Module/Channel.php:29 ../../Zotlabs/Module/Chat.php:25
 msgid "You must be logged in to see this page."
 msgstr "Je moet zijn ingelogd om deze pagina te kunnen bekijken."
 
@@ -1609,97 +1616,97 @@ msgstr "Alleen berichten"
 msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr "Onvoldoende permissies.  Doorgestuurd naar profielpagina."
 
-#: ../../Zotlabs/Module/Chat.php:179
+#: ../../Zotlabs/Module/Chat.php:181
 msgid "Room not found"
 msgstr "Chatkanaal niet gevonden"
 
-#: ../../Zotlabs/Module/Chat.php:195
+#: ../../Zotlabs/Module/Chat.php:197
 msgid "Leave Room"
 msgstr "Chatkanaal verlaten"
 
-#: ../../Zotlabs/Module/Chat.php:196
+#: ../../Zotlabs/Module/Chat.php:198
 msgid "Delete Room"
 msgstr "Chatkanaal verwijderen"
 
-#: ../../Zotlabs/Module/Chat.php:197
+#: ../../Zotlabs/Module/Chat.php:199
 msgid "I am away right now"
 msgstr "Ik ben momenteel afwezig"
 
-#: ../../Zotlabs/Module/Chat.php:198
+#: ../../Zotlabs/Module/Chat.php:200
 msgid "I am online"
 msgstr "Ik ben online"
 
-#: ../../Zotlabs/Module/Chat.php:200
+#: ../../Zotlabs/Module/Chat.php:202
 msgid "Bookmark this room"
 msgstr "Chatkanaal aan bladwijzers toevoegen"
 
-#: ../../Zotlabs/Module/Chat.php:203 ../../Zotlabs/Module/Mail.php:206
-#: ../../Zotlabs/Module/Mail.php:320 ../../include/conversation.php:1182
+#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:205
+#: ../../Zotlabs/Module/Mail.php:314 ../../include/conversation.php:1176
 msgid "Please enter a link URL:"
 msgstr "Vul een URL in:"
 
-#: ../../Zotlabs/Module/Chat.php:204 ../../Zotlabs/Module/Mail.php:259
-#: ../../Zotlabs/Module/Mail.php:389 ../../include/ItemObject.php:715
-#: ../../include/conversation.php:1262
+#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:258
+#: ../../Zotlabs/Module/Mail.php:383 ../../Zotlabs/Lib/ThreadItem.php:711
+#: ../../include/conversation.php:1256
 msgid "Encrypt text"
 msgstr "Tekst versleutelen"
 
-#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Editblock.php:111
-#: ../../Zotlabs/Module/Editwebpage.php:147 ../../Zotlabs/Module/Mail.php:253
-#: ../../Zotlabs/Module/Mail.php:383 ../../include/conversation.php:1149
+#: ../../Zotlabs/Module/Chat.php:207 ../../Zotlabs/Module/Editblock.php:111
+#: ../../Zotlabs/Module/Editwebpage.php:147 ../../Zotlabs/Module/Mail.php:252
+#: ../../Zotlabs/Module/Mail.php:377 ../../include/conversation.php:1143
 msgid "Insert web link"
 msgstr "Weblink invoegen"
 
-#: ../../Zotlabs/Module/Chat.php:216
+#: ../../Zotlabs/Module/Chat.php:218
 msgid "Feature disabled."
 msgstr "Functie uitgeschakeld."
 
-#: ../../Zotlabs/Module/Chat.php:230
+#: ../../Zotlabs/Module/Chat.php:232
 msgid "New Chatroom"
 msgstr "Nieuw chatkanaal"
 
-#: ../../Zotlabs/Module/Chat.php:231
+#: ../../Zotlabs/Module/Chat.php:233
 msgid "Chatroom name"
 msgstr "Naam chatkanaal"
 
-#: ../../Zotlabs/Module/Chat.php:232
+#: ../../Zotlabs/Module/Chat.php:234
 msgid "Expiration of chats (minutes)"
 msgstr "Aantal minuten voordat chatberichten worden verwijderd"
 
-#: ../../Zotlabs/Module/Chat.php:233 ../../Zotlabs/Module/Filestorage.php:153
+#: ../../Zotlabs/Module/Chat.php:235 ../../Zotlabs/Module/Filestorage.php:153
 #: ../../Zotlabs/Module/Photos.php:671 ../../Zotlabs/Module/Photos.php:1045
 #: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:359
-#: ../../include/acl_selectors.php:288
+#: ../../include/acl_selectors.php:283
 msgid "Permissions"
 msgstr "Permissies"
 
-#: ../../Zotlabs/Module/Chat.php:244
+#: ../../Zotlabs/Module/Chat.php:246
 #, php-format
 msgid "%1$s's Chatrooms"
 msgstr "Chatkanalen van %1$s"
 
-#: ../../Zotlabs/Module/Chat.php:249
+#: ../../Zotlabs/Module/Chat.php:251
 msgid "No chatrooms available"
 msgstr "Geen chatkanalen beschikbaar"
 
-#: ../../Zotlabs/Module/Chat.php:250 ../../Zotlabs/Module/Manage.php:143
-#: ../../Zotlabs/Module/Profiles.php:782
+#: ../../Zotlabs/Module/Chat.php:252 ../../Zotlabs/Module/Manage.php:143
+#: ../../Zotlabs/Module/Profiles.php:778
 msgid "Create New"
 msgstr "Nieuwe aanmaken"
 
-#: ../../Zotlabs/Module/Chat.php:253
+#: ../../Zotlabs/Module/Chat.php:255
 msgid "Expiration"
 msgstr "Verloopt na"
 
-#: ../../Zotlabs/Module/Chat.php:254
+#: ../../Zotlabs/Module/Chat.php:256
 msgid "min"
 msgstr "min"
 
-#: ../../Zotlabs/Module/Chatsvc.php:115
+#: ../../Zotlabs/Module/Chatsvc.php:117
 msgid "Away"
 msgstr "Afwezig"
 
-#: ../../Zotlabs/Module/Chatsvc.php:120
+#: ../../Zotlabs/Module/Chatsvc.php:122
 msgid "Online"
 msgstr "Online"
 
@@ -1784,13 +1791,13 @@ msgstr "Gearchiveerd"
 
 #: ../../Zotlabs/Module/Connections.php:76
 #: ../../Zotlabs/Module/Connections.php:86 ../../Zotlabs/Module/Menu.php:116
-#: ../../include/conversation.php:1541
+#: ../../include/conversation.php:1535
 msgid "New"
 msgstr "Nieuw"
 
 #: ../../Zotlabs/Module/Connections.php:92
 #: ../../Zotlabs/Module/Connections.php:107
-#: ../../Zotlabs/Module/Connedit.php:597 ../../include/widgets.php:497
+#: ../../Zotlabs/Module/Connedit.php:594 ../../include/widgets.php:497
 msgid "All"
 msgstr "Alles"
 
@@ -1865,7 +1872,7 @@ msgid "Ignore connection"
 msgstr "Connectie negeren"
 
 #: ../../Zotlabs/Module/Connections.php:277
-#: ../../Zotlabs/Module/Connedit.php:549
+#: ../../Zotlabs/Module/Connedit.php:548
 #: ../../Zotlabs/Module/Notifications.php:55
 msgid "Ignore"
 msgstr "Negeren"
@@ -1874,15 +1881,15 @@ msgstr "Negeren"
 msgid "Recent activity"
 msgstr "Recente activiteit"
 
-#: ../../Zotlabs/Module/Connections.php:302 ../../include/nav.php:186
-#: ../../include/text.php:863 ../../include/apps.php:159
+#: ../../Zotlabs/Module/Connections.php:302 ../../Zotlabs/Lib/Apps.php:208
+#: ../../include/nav.php:186 ../../include/text.php:875
 msgid "Connections"
 msgstr "Connecties"
 
 #: ../../Zotlabs/Module/Connections.php:306 ../../Zotlabs/Module/Search.php:44
-#: ../../include/nav.php:165 ../../include/text.php:933
-#: ../../include/text.php:945 ../../include/apps.php:179
-#: ../../include/acl_selectors.php:281
+#: ../../Zotlabs/Lib/Apps.php:228 ../../include/nav.php:165
+#: ../../include/acl_selectors.php:276 ../../include/text.php:945
+#: ../../include/text.php:957
 msgid "Search"
 msgstr "Zoeken"
 
@@ -1896,7 +1903,7 @@ msgstr "Connecties zoeken"
 
 #: ../../Zotlabs/Module/Connections.php:309
 #: ../../Zotlabs/Module/Directory.php:388
-#: ../../Zotlabs/Module/Directory.php:393 ../../include/contact_widgets.php:26
+#: ../../Zotlabs/Module/Directory.php:393 ../../include/contact_widgets.php:23
 msgid "Find"
 msgstr "Vinden"
 
@@ -1934,240 +1941,240 @@ msgstr "Vernieuwen mislukt - kanaal is momenteel niet beschikbaar"
 msgid "Unable to set address book parameters."
 msgstr "Niet in staat om de parameters van connecties in te stellen."
 
-#: ../../Zotlabs/Module/Connedit.php:504
+#: ../../Zotlabs/Module/Connedit.php:503
 msgid "Connection has been removed."
 msgstr "Connectie is verwijderd"
 
-#: ../../Zotlabs/Module/Connedit.php:520 ../../include/nav.php:86
-#: ../../include/conversation.php:959 ../../include/apps.php:170
+#: ../../Zotlabs/Module/Connedit.php:519 ../../Zotlabs/Lib/Apps.php:219
+#: ../../include/conversation.php:954 ../../include/nav.php:86
 msgid "View Profile"
 msgstr "Profiel weergeven"
 
-#: ../../Zotlabs/Module/Connedit.php:523
+#: ../../Zotlabs/Module/Connedit.php:522
 #, php-format
 msgid "View %s's profile"
 msgstr "Profiel van %s weergeven"
 
-#: ../../Zotlabs/Module/Connedit.php:527
+#: ../../Zotlabs/Module/Connedit.php:526
 msgid "Refresh Permissions"
 msgstr "Permissies vernieuwen"
 
-#: ../../Zotlabs/Module/Connedit.php:530
+#: ../../Zotlabs/Module/Connedit.php:529
 msgid "Fetch updated permissions"
 msgstr "Aangepaste permissies ophalen"
 
-#: ../../Zotlabs/Module/Connedit.php:534
+#: ../../Zotlabs/Module/Connedit.php:533
 msgid "Recent Activity"
 msgstr "Recente activiteit/berichten"
 
-#: ../../Zotlabs/Module/Connedit.php:537
+#: ../../Zotlabs/Module/Connedit.php:536
 msgid "View recent posts and comments"
 msgstr "Recente berichten en reacties weergeven"
 
-#: ../../Zotlabs/Module/Connedit.php:544
+#: ../../Zotlabs/Module/Connedit.php:543
 msgid "Block (or Unblock) all communications with this connection"
 msgstr "Blokkeer (of deblokkeer) alle communicatie met deze connectie"
 
-#: ../../Zotlabs/Module/Connedit.php:545
+#: ../../Zotlabs/Module/Connedit.php:544
 msgid "This connection is blocked!"
 msgstr "Deze connectie is geblokkeerd!"
 
-#: ../../Zotlabs/Module/Connedit.php:549
+#: ../../Zotlabs/Module/Connedit.php:548
 msgid "Unignore"
 msgstr "Niet meer negeren"
 
-#: ../../Zotlabs/Module/Connedit.php:552
+#: ../../Zotlabs/Module/Connedit.php:551
 msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr "Negeer (of negeer niet meer) alle inkomende communicatie van deze connectie"
 
-#: ../../Zotlabs/Module/Connedit.php:553
+#: ../../Zotlabs/Module/Connedit.php:552
 msgid "This connection is ignored!"
 msgstr "Deze connectie wordt genegeerd!"
 
-#: ../../Zotlabs/Module/Connedit.php:557
+#: ../../Zotlabs/Module/Connedit.php:556
 msgid "Unarchive"
 msgstr "Niet meer archiveren"
 
-#: ../../Zotlabs/Module/Connedit.php:557
+#: ../../Zotlabs/Module/Connedit.php:556
 msgid "Archive"
 msgstr "Archiveren"
 
-#: ../../Zotlabs/Module/Connedit.php:560
+#: ../../Zotlabs/Module/Connedit.php:559
 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"
 
-#: ../../Zotlabs/Module/Connedit.php:561
+#: ../../Zotlabs/Module/Connedit.php:560
 msgid "This connection is archived!"
 msgstr "Deze connectie is gearchiveerd!"
 
-#: ../../Zotlabs/Module/Connedit.php:565
+#: ../../Zotlabs/Module/Connedit.php:564
 msgid "Unhide"
 msgstr "Niet meer verbergen"
 
-#: ../../Zotlabs/Module/Connedit.php:565
+#: ../../Zotlabs/Module/Connedit.php:564
 msgid "Hide"
 msgstr "Verbergen"
 
-#: ../../Zotlabs/Module/Connedit.php:568
+#: ../../Zotlabs/Module/Connedit.php:567
 msgid "Hide or Unhide this connection from your other connections"
 msgstr "Deze connectie verbergen (of niet meer verbergen) voor jouw andere connecties"
 
-#: ../../Zotlabs/Module/Connedit.php:569
+#: ../../Zotlabs/Module/Connedit.php:568
 msgid "This connection is hidden!"
 msgstr "Deze connectie is verborgen!"
 
-#: ../../Zotlabs/Module/Connedit.php:576
+#: ../../Zotlabs/Module/Connedit.php:575
 msgid "Delete this connection"
 msgstr "Deze connectie verwijderen"
 
-#: ../../Zotlabs/Module/Connedit.php:593 ../../include/widgets.php:493
+#: ../../Zotlabs/Module/Connedit.php:590 ../../include/widgets.php:493
 msgid "Me"
 msgstr "Ik"
 
-#: ../../Zotlabs/Module/Connedit.php:594 ../../include/widgets.php:494
+#: ../../Zotlabs/Module/Connedit.php:591 ../../include/widgets.php:494
 msgid "Family"
 msgstr "Familie"
 
-#: ../../Zotlabs/Module/Connedit.php:595 ../../Zotlabs/Module/Settings.php:342
+#: ../../Zotlabs/Module/Connedit.php:592 ../../Zotlabs/Module/Settings.php:342
 #: ../../Zotlabs/Module/Settings.php:346 ../../Zotlabs/Module/Settings.php:347
 #: ../../Zotlabs/Module/Settings.php:350 ../../Zotlabs/Module/Settings.php:361
-#: ../../include/profile_selectors.php:80 ../../include/widgets.php:495
-#: ../../include/identity.php:389 ../../include/identity.php:390
-#: ../../include/identity.php:397
+#: ../../include/selectors.php:123 ../../include/channel.php:389
+#: ../../include/channel.php:390 ../../include/channel.php:397
+#: ../../include/widgets.php:495
 msgid "Friends"
 msgstr "Vrienden"
 
-#: ../../Zotlabs/Module/Connedit.php:596 ../../include/widgets.php:496
+#: ../../Zotlabs/Module/Connedit.php:593 ../../include/widgets.php:496
 msgid "Acquaintances"
 msgstr "Kennissen"
 
-#: ../../Zotlabs/Module/Connedit.php:657
+#: ../../Zotlabs/Module/Connedit.php:654
 msgid "Approve this connection"
 msgstr "Deze connectie accepteren"
 
-#: ../../Zotlabs/Module/Connedit.php:657
+#: ../../Zotlabs/Module/Connedit.php:654
 msgid "Accept connection to allow communication"
 msgstr "Keur deze connectie goed om communicatie toe te staan"
 
-#: ../../Zotlabs/Module/Connedit.php:662
+#: ../../Zotlabs/Module/Connedit.php:659
 msgid "Set Affinity"
 msgstr "Verwantschapsfilter instellen"
 
-#: ../../Zotlabs/Module/Connedit.php:665
+#: ../../Zotlabs/Module/Connedit.php:662
 msgid "Set Profile"
 msgstr "Profiel instellen"
 
-#: ../../Zotlabs/Module/Connedit.php:668
+#: ../../Zotlabs/Module/Connedit.php:665
 msgid "Set Affinity & Profile"
 msgstr "Verwantschapsfilter en profiel instellen"
 
-#: ../../Zotlabs/Module/Connedit.php:701
+#: ../../Zotlabs/Module/Connedit.php:698
 msgid "none"
 msgstr "geen"
 
-#: ../../Zotlabs/Module/Connedit.php:705 ../../include/widgets.php:614
+#: ../../Zotlabs/Module/Connedit.php:702 ../../include/widgets.php:614
 msgid "Connection Default Permissions"
 msgstr "Standaard permissies voor connecties"
 
-#: ../../Zotlabs/Module/Connedit.php:705 ../../include/items.php:3927
+#: ../../Zotlabs/Module/Connedit.php:702 ../../include/items.php:3928
 #, php-format
 msgid "Connection: %s"
 msgstr "Connectie: %s"
 
-#: ../../Zotlabs/Module/Connedit.php:706
+#: ../../Zotlabs/Module/Connedit.php:703
 msgid "Apply these permissions automatically"
 msgstr "Deze permissies automatisch toepassen"
 
-#: ../../Zotlabs/Module/Connedit.php:706
+#: ../../Zotlabs/Module/Connedit.php:703
 msgid "Connection requests will be approved without your interaction"
 msgstr "Connectieverzoeken zullen automatisch worden geaccepteerd"
 
-#: ../../Zotlabs/Module/Connedit.php:708
+#: ../../Zotlabs/Module/Connedit.php:705
 msgid "This connection's primary address is"
 msgstr "Het primaire kanaaladres van deze connectie is"
 
-#: ../../Zotlabs/Module/Connedit.php:709
+#: ../../Zotlabs/Module/Connedit.php:706
 msgid "Available locations:"
 msgstr "Beschikbare locaties:"
 
-#: ../../Zotlabs/Module/Connedit.php:713
+#: ../../Zotlabs/Module/Connedit.php:710
 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."
 
-#: ../../Zotlabs/Module/Connedit.php:714
+#: ../../Zotlabs/Module/Connedit.php:711
 msgid "Connection Tools"
 msgstr "Hulpmiddelen"
 
-#: ../../Zotlabs/Module/Connedit.php:716
+#: ../../Zotlabs/Module/Connedit.php:713
 msgid "Slide to adjust your degree of friendship"
 msgstr "Schuif om te bepalen hoe goed je iemand kent en/of mag"
 
-#: ../../Zotlabs/Module/Connedit.php:717 ../../Zotlabs/Module/Rate.php:159
+#: ../../Zotlabs/Module/Connedit.php:714 ../../Zotlabs/Module/Rate.php:159
 #: ../../include/js_strings.php:20
 msgid "Rating"
 msgstr "Beoordeling"
 
-#: ../../Zotlabs/Module/Connedit.php:718
+#: ../../Zotlabs/Module/Connedit.php:715
 msgid "Slide to adjust your rating"
 msgstr "Gebruik de schuif om je beoordeling te geven"
 
-#: ../../Zotlabs/Module/Connedit.php:719 ../../Zotlabs/Module/Connedit.php:724
+#: ../../Zotlabs/Module/Connedit.php:716 ../../Zotlabs/Module/Connedit.php:721
 msgid "Optionally explain your rating"
 msgstr "Verklaar jouw beoordeling (niet verplicht)"
 
-#: ../../Zotlabs/Module/Connedit.php:721
+#: ../../Zotlabs/Module/Connedit.php:718
 msgid "Custom Filter"
 msgstr "Berichtenfilter"
 
-#: ../../Zotlabs/Module/Connedit.php:722
+#: ../../Zotlabs/Module/Connedit.php:719
 msgid "Only import posts with this text"
 msgstr "Importeer alleen berichten met deze tekst"
 
-#: ../../Zotlabs/Module/Connedit.php:722 ../../Zotlabs/Module/Connedit.php:723
+#: ../../Zotlabs/Module/Connedit.php:719 ../../Zotlabs/Module/Connedit.php:720
 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"
 
-#: ../../Zotlabs/Module/Connedit.php:723
+#: ../../Zotlabs/Module/Connedit.php:720
 msgid "Do not import posts with this text"
 msgstr "Importeer geen berichten met deze tekst"
 
-#: ../../Zotlabs/Module/Connedit.php:725
+#: ../../Zotlabs/Module/Connedit.php:722
 msgid "This information is public!"
 msgstr "Deze informatie is openbaar!"
 
-#: ../../Zotlabs/Module/Connedit.php:730
+#: ../../Zotlabs/Module/Connedit.php:727
 msgid "Connection Pending Approval"
 msgstr "Connectie moet nog geaccepteerd worden"
 
-#: ../../Zotlabs/Module/Connedit.php:733
+#: ../../Zotlabs/Module/Connedit.php:730
 msgid "inherited"
 msgstr "geërfd"
 
-#: ../../Zotlabs/Module/Connedit.php:735
+#: ../../Zotlabs/Module/Connedit.php:732
 #, 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."
 
-#: ../../Zotlabs/Module/Connedit.php:737
+#: ../../Zotlabs/Module/Connedit.php:734
 msgid "Their Settings"
 msgstr "Hun instellingen"
 
-#: ../../Zotlabs/Module/Connedit.php:738
+#: ../../Zotlabs/Module/Connedit.php:735
 msgid "My Settings"
 msgstr "Mijn instellingen"
 
-#: ../../Zotlabs/Module/Connedit.php:740
+#: ../../Zotlabs/Module/Connedit.php:737
 msgid "Individual Permissions"
 msgstr "Individuele permissies"
 
-#: ../../Zotlabs/Module/Connedit.php:741
+#: ../../Zotlabs/Module/Connedit.php:738
 msgid ""
 "Some permissions may be inherited from your channel's <a "
 "href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
@@ -2175,7 +2182,7 @@ msgid ""
 " 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."
 
-#: ../../Zotlabs/Module/Connedit.php:742
+#: ../../Zotlabs/Module/Connedit.php:739
 msgid ""
 "Some permissions may be inherited from your channel's <a "
 "href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
@@ -2183,7 +2190,7 @@ msgid ""
 "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. "
 
-#: ../../Zotlabs/Module/Connedit.php:743
+#: ../../Zotlabs/Module/Connedit.php:740
 msgid "Last update:"
 msgstr "Laatste wijziging:"
 
@@ -2203,7 +2210,7 @@ msgid "Image resize failed."
 msgstr "Afbeelding kon niet van grootte veranderd worden."
 
 #: ../../Zotlabs/Module/Cover_photo.php:168
-#: ../../Zotlabs/Module/Profile_photo.php:192 ../../include/photos.php:146
+#: ../../Zotlabs/Module/Profile_photo.php:192 ../../include/photos.php:144
 msgid "Unable to process image"
 msgstr "Afbeelding kan niet verwerkt worden"
 
@@ -2217,30 +2224,30 @@ msgstr "Uploaden afbeelding mislukt"
 msgid "Unable to process image."
 msgstr "Niet in staat om afbeelding te verwerken."
 
-#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4271
+#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4272
 msgid "female"
 msgstr "vrouw"
 
-#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4272
+#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4273
 #, php-format
 msgid "%1$s updated her %2$s"
 msgstr "%1$s heeft haar %2$s bijgewerkt"
 
-#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:4273
+#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:4274
 msgid "male"
 msgstr "man"
 
-#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4274
+#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4275
 #, php-format
 msgid "%1$s updated his %2$s"
 msgstr "%1$s heeft zijn %2$s bijgewerkt"
 
-#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4276
+#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4277
 #, php-format
 msgid "%1$s updated their %2$s"
 msgstr "De %2$s van %1$s is bijgewerkt"
 
-#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/identity.php:1807
+#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/channel.php:1661
 msgid "cover photo"
 msgstr "omslagfoto"
 
@@ -2296,10 +2303,10 @@ msgstr "Snij de afbeelding zo uit dat deze optimaal wordt weergegeven."
 msgid "Done Editing"
 msgstr "Klaar met bewerken"
 
-#: ../../Zotlabs/Module/Directory.php:63 ../../Zotlabs/Module/Display.php:21
+#: ../../Zotlabs/Module/Directory.php:63 ../../Zotlabs/Module/Display.php:17
 #: ../../Zotlabs/Module/Photos.php:522 ../../Zotlabs/Module/Ratings.php:86
 #: ../../Zotlabs/Module/Search.php:17
-#: ../../Zotlabs/Module/Viewconnections.php:21
+#: ../../Zotlabs/Module/Viewconnections.php:20
 msgid "Public access denied."
 msgstr "Openbare toegang geweigerd."
 
@@ -2322,13 +2329,13 @@ msgstr "Status: "
 msgid "Homepage: "
 msgstr "Homepage: "
 
-#: ../../Zotlabs/Module/Directory.php:306 ../../include/identity.php:1329
+#: ../../Zotlabs/Module/Directory.php:306 ../../include/channel.php:1183
 msgid "Age:"
 msgstr "Leeftijd:"
 
 #: ../../Zotlabs/Module/Directory.php:311 ../../include/event.php:52
-#: ../../include/identity.php:1029 ../../include/text.php:1481
-#: ../../include/bb2diaspora.php:509
+#: ../../include/event.php:84 ../../include/channel.php:1027
+#: ../../include/bb2diaspora.php:507
 msgid "Location:"
 msgstr "Plaats:"
 
@@ -2336,18 +2343,18 @@ msgstr "Plaats:"
 msgid "Description:"
 msgstr "Omschrijving:"
 
-#: ../../Zotlabs/Module/Directory.php:322 ../../include/identity.php:1345
+#: ../../Zotlabs/Module/Directory.php:322 ../../include/channel.php:1199
 msgid "Hometown:"
 msgstr "Oorspronkelijk uit:"
 
-#: ../../Zotlabs/Module/Directory.php:324 ../../include/identity.php:1353
+#: ../../Zotlabs/Module/Directory.php:324 ../../include/channel.php:1207
 msgid "About:"
 msgstr "Over:"
 
 #: ../../Zotlabs/Module/Directory.php:325 ../../Zotlabs/Module/Match.php:68
-#: ../../Zotlabs/Module/Suggest.php:56 ../../include/Contact.php:101
+#: ../../Zotlabs/Module/Suggest.php:56 ../../include/connections.php:78
+#: ../../include/conversation.php:956 ../../include/channel.php:1012
 #: ../../include/widgets.php:147 ../../include/widgets.php:184
-#: ../../include/identity.php:1014 ../../include/conversation.php:961
 msgid "Connect"
 msgstr "Verbinden"
 
@@ -2380,7 +2387,7 @@ msgid "Finding:"
 msgstr "Gezocht naar:"
 
 #: ../../Zotlabs/Module/Directory.php:392 ../../Zotlabs/Module/Suggest.php:64
-#: ../../include/contact_widgets.php:27
+#: ../../include/contact_widgets.php:24
 msgid "Channel Suggestions"
 msgstr "Voorgestelde kanalen"
 
@@ -2424,14 +2431,6 @@ msgstr "Deze hub is geen kanalengidshub (directoryserver)"
 msgid "This directory server requires an access token"
 msgstr "Deze kanalengidshub (directoryserver) heeft een toegangs-token nodig"
 
-#: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:49
-#: ../../Zotlabs/Module/Group.php:72 ../../Zotlabs/Module/Import_items.php:112
-#: ../../Zotlabs/Module/Like.php:284 ../../Zotlabs/Module/Profperm.php:28
-#: ../../Zotlabs/Module/Subthread.php:62 ../../include/items.php:383
-#: ../../index.php:174
-msgid "Permission denied"
-msgstr "Toegang geweigerd"
-
 #: ../../Zotlabs/Module/Dreport.php:27
 msgid "Invalid message"
 msgstr "Ongeldig bericht"
@@ -2495,7 +2494,7 @@ msgstr "privébericht afgeleverd"
 msgid "Item not found"
 msgstr "Item niet gevonden"
 
-#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1234
+#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1228
 msgid "Title (optional)"
 msgstr "Titel (optioneel)"
 
@@ -2559,8 +2558,8 @@ msgid "Event not found."
 msgstr "Gebeurtenis niet gevonden"
 
 #: ../../Zotlabs/Module/Events.php:254 ../../Zotlabs/Module/Like.php:373
-#: ../../Zotlabs/Module/Tagger.php:51 ../../include/event.php:905
-#: ../../include/conversation.php:123 ../../include/text.php:1955
+#: ../../Zotlabs/Module/Tagger.php:51 ../../include/conversation.php:123
+#: ../../include/event.php:949 ../../include/text.php:1928
 msgid "event"
 msgstr "gebeurtenis"
 
@@ -2623,8 +2622,8 @@ msgid "Edit Location"
 msgstr "Locatie bewerken"
 
 #: ../../Zotlabs/Module/Events.php:464 ../../Zotlabs/Module/Locs.php:117
-#: ../../Zotlabs/Module/Profiles.php:476 ../../Zotlabs/Module/Profiles.php:702
-#: ../../Zotlabs/Module/Pubsites.php:40 ../../include/js_strings.php:25
+#: ../../Zotlabs/Module/Profiles.php:477 ../../Zotlabs/Module/Profiles.php:698
+#: ../../Zotlabs/Module/Pubsites.php:41 ../../include/js_strings.php:25
 msgid "Location"
 msgstr "Locatie"
 
@@ -2633,12 +2632,12 @@ msgid "Share this event"
 msgstr "Deel deze gebeurtenis"
 
 #: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Photos.php:1093
-#: ../../Zotlabs/Module/Webpages.php:194 ../../include/ItemObject.php:712
-#: ../../include/conversation.php:1193 ../../include/page_widgets.php:40
+#: ../../Zotlabs/Module/Webpages.php:194 ../../Zotlabs/Lib/ThreadItem.php:708
+#: ../../include/conversation.php:1187 ../../include/page_widgets.php:40
 msgid "Preview"
 msgstr "Voorvertoning"
 
-#: ../../Zotlabs/Module/Events.php:471 ../../include/conversation.php:1238
+#: ../../Zotlabs/Module/Events.php:471 ../../include/conversation.php:1232
 msgid "Permission settings"
 msgstr "Permissies"
 
@@ -2666,8 +2665,8 @@ msgstr "Gebeurtenis verwijderd"
 msgid "Failed to remove event"
 msgstr "Verwijderen gebeurtenis mislukt"
 
-#: ../../Zotlabs/Module/Fbrowser.php:29 ../../include/nav.php:92
-#: ../../include/conversation.php:1638 ../../include/apps.php:171
+#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:220
+#: ../../include/conversation.php:1632 ../../include/nav.php:92
 msgid "Photos"
 msgstr "Foto's"
 
@@ -2735,23 +2734,6 @@ msgstr "Jouw connecties over dit bestand berichten"
 msgid "Channel added."
 msgstr "Kanaal toegevoegd."
 
-#: ../../Zotlabs/Module/Fsuggest.php:24 ../../Zotlabs/Module/Fsuggest.php:96
-msgid "Contact not found."
-msgstr "Contact niet gevonden"
-
-#: ../../Zotlabs/Module/Fsuggest.php:67
-msgid "Friend suggestion sent."
-msgstr "Kanaalvoorstel verzonden."
-
-#: ../../Zotlabs/Module/Fsuggest.php:101
-msgid "Suggest Friends"
-msgstr "Kanalen voorstellen"
-
-#: ../../Zotlabs/Module/Fsuggest.php:103
-#, php-format
-msgid "Suggest a friend for %s"
-msgstr "Stel een kanaal voor aan %s"
-
 #: ../../Zotlabs/Module/Group.php:24
 msgid "Privacy group created."
 msgstr "Privacygroep aangemaakt"
@@ -2761,7 +2743,7 @@ msgid "Could not create privacy group."
 msgstr "Kon privacygroep niet aanmaken"
 
 #: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141
-#: ../../include/items.php:3894
+#: ../../include/items.php:3895
 msgid "Privacy group not found."
 msgstr "Privacygroep niet gevonden"
 
@@ -2815,8 +2797,8 @@ msgid "Help:"
 msgstr "Hulp:"
 
 #: ../../Zotlabs/Module/Help.php:85 ../../Zotlabs/Module/Help.php:90
-#: ../../Zotlabs/Module/Layouts.php:183 ../../include/nav.php:159
-#: ../../include/apps.php:174
+#: ../../Zotlabs/Module/Layouts.php:183 ../../Zotlabs/Lib/Apps.php:223
+#: ../../include/nav.php:159
 msgid "Help"
 msgstr "Hulp"
 
@@ -2851,7 +2833,7 @@ msgid "Full Name"
 msgstr "Volledige naam"
 
 #: ../../Zotlabs/Module/Id.php:19 ../../Zotlabs/Module/Id.php:20
-#: ../../Zotlabs/Module/Id.php:21 ../../include/apps.php:187
+#: ../../Zotlabs/Module/Id.php:21 ../../Zotlabs/Lib/Apps.php:236
 msgid "Profile Photo"
 msgstr "Profielfoto"
 
@@ -2883,11 +2865,11 @@ msgstr "Profielfoto 128px"
 msgid "Timezone"
 msgstr "Tijdzone"
 
-#: ../../Zotlabs/Module/Id.php:29 ../../Zotlabs/Module/Profiles.php:735
+#: ../../Zotlabs/Module/Id.php:29 ../../Zotlabs/Module/Profiles.php:731
 msgid "Homepage URL"
 msgstr "URL homepagina"
 
-#: ../../Zotlabs/Module/Id.php:30 ../../include/apps.php:185
+#: ../../Zotlabs/Module/Id.php:30 ../../Zotlabs/Lib/Apps.php:234
 msgid "Language"
 msgstr "Taal"
 
@@ -2907,33 +2889,33 @@ msgstr "Geboortedag"
 msgid "Birthdate"
 msgstr "Geboortedatum"
 
-#: ../../Zotlabs/Module/Id.php:35 ../../Zotlabs/Module/Profiles.php:453
+#: ../../Zotlabs/Module/Id.php:35 ../../Zotlabs/Module/Profiles.php:454
 msgid "Gender"
 msgstr "Geslacht"
 
-#: ../../Zotlabs/Module/Id.php:108 ../../include/profile_selectors.php:6
-#: ../../include/profile_selectors.php:23
+#: ../../Zotlabs/Module/Id.php:108 ../../include/selectors.php:49
+#: ../../include/selectors.php:66
 msgid "Male"
 msgstr "Man"
 
-#: ../../Zotlabs/Module/Id.php:110 ../../include/profile_selectors.php:6
-#: ../../include/profile_selectors.php:23
+#: ../../Zotlabs/Module/Id.php:110 ../../include/selectors.php:49
+#: ../../include/selectors.php:66
 msgid "Female"
 msgstr "Vrouw"
 
-#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:193
+#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:192
 msgid "webpage"
 msgstr "Webpagina"
 
-#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:199
+#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:198
 msgid "block"
 msgstr "blok"
 
-#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:196
+#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:195
 msgid "layout"
 msgstr "lay-out"
 
-#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:202
+#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:201
 msgid "menu"
 msgstr "menu"
 
@@ -2971,7 +2953,7 @@ msgstr "Geïmporteerde bestand is leeg"
 msgid "Warning: Database versions differ by %1$d updates."
 msgstr "Waarschuwing: database-versies lopen %1$d updates achter."
 
-#: ../../Zotlabs/Module/Import.php:150 ../../include/import.php:84
+#: ../../Zotlabs/Module/Import.php:150 ../../include/import.php:86
 msgid "Cloned channel not found. Import failed."
 msgstr "Gekloond kanaal niet gevonden. Importeren mislukt."
 
@@ -2979,48 +2961,48 @@ msgstr "Gekloond kanaal niet gevonden. Importeren mislukt."
 msgid "No channel. Import failed."
 msgstr "Geen kanaal. Importeren mislukt."
 
-#: ../../Zotlabs/Module/Import.php:506
-#: ../../include/Import/import_diaspora.php:143
+#: ../../Zotlabs/Module/Import.php:510
+#: ../../include/Import/import_diaspora.php:142
 msgid "Import completed."
 msgstr "Import voltooid."
 
-#: ../../Zotlabs/Module/Import.php:528
+#: ../../Zotlabs/Module/Import.php:532
 msgid "You must be logged in to use this feature."
 msgstr "Je moet ingelogd zijn om dit onderdeel te kunnen gebruiken."
 
-#: ../../Zotlabs/Module/Import.php:533
+#: ../../Zotlabs/Module/Import.php:537
 msgid "Import Channel"
 msgstr "Kanaal importeren"
 
-#: ../../Zotlabs/Module/Import.php:534
+#: ../../Zotlabs/Module/Import.php:538
 msgid ""
 "Use this form to import an existing channel from a different server/hub. You"
 " may retrieve the channel identity from the old server/hub via the network "
 "or provide an export file."
 msgstr "Gebruik dit formulier om een bestaand kanaal te importeren van een andere hub. Je kan de kanaal-identiteit van de oude hub via het netwerk ontvangen of een exportbestand verstrekken."
 
-#: ../../Zotlabs/Module/Import.php:535
+#: ../../Zotlabs/Module/Import.php:539
 #: ../../Zotlabs/Module/Import_items.php:119
 msgid "File to Upload"
 msgstr "Bestand om te uploaden"
 
-#: ../../Zotlabs/Module/Import.php:536
+#: ../../Zotlabs/Module/Import.php:540
 msgid "Or provide the old server/hub details"
 msgstr "Of vul de gegevens van de oude hub in"
 
-#: ../../Zotlabs/Module/Import.php:537
+#: ../../Zotlabs/Module/Import.php:541
 msgid "Your old identity address (xyz@example.com)"
 msgstr "Jouw oude kanaaladres (xyz@example.com)"
 
-#: ../../Zotlabs/Module/Import.php:538
+#: ../../Zotlabs/Module/Import.php:542
 msgid "Your old login email address"
 msgstr "Het e-mailadres van je oude account"
 
-#: ../../Zotlabs/Module/Import.php:539
+#: ../../Zotlabs/Module/Import.php:543
 msgid "Your old login password"
 msgstr "Wachtwoord van jouw oude account"
 
-#: ../../Zotlabs/Module/Import.php:540
+#: ../../Zotlabs/Module/Import.php:544
 msgid ""
 "For either option, please choose whether to make this hub your new primary "
 "address, or whether your old location should continue this role. You will be"
@@ -3028,17 +3010,17 @@ msgid ""
 "primary location for files, photos, and media."
 msgstr "Voor elke optie geldt dat je moet kiezen of je jouw primaire kanaaladres op deze hub wil instellen of dat jouw oude hub deze rol blijft vervullen."
 
-#: ../../Zotlabs/Module/Import.php:541
+#: ../../Zotlabs/Module/Import.php:545
 msgid "Make this hub my primary location"
 msgstr "Stel deze hub als mijn primaire locatie in"
 
-#: ../../Zotlabs/Module/Import.php:542
+#: ../../Zotlabs/Module/Import.php:546
 msgid ""
 "Import existing posts if possible (experimental - limited by available "
 "memory"
 msgstr "Importeer bestaande berichten wanneer mogelijk (experimenteel - afhankelijk van beschikbaar servergeheugen)"
 
-#: ../../Zotlabs/Module/Import.php:543
+#: ../../Zotlabs/Module/Import.php:547
 msgid ""
 "This process may take several minutes to complete. Please submit the form "
 "only once and leave this page open until finished."
@@ -3098,7 +3080,7 @@ msgstr "Uitnodigingen verzenden"
 msgid "Enter email addresses, one per line:"
 msgstr "Voer e-mailadressen in, één per regel:"
 
-#: ../../Zotlabs/Module/Invite.php:135 ../../Zotlabs/Module/Mail.php:250
+#: ../../Zotlabs/Module/Invite.php:135 ../../Zotlabs/Module/Mail.php:249
 msgid "Your message:"
 msgstr "Jouw bericht:"
 
@@ -3161,7 +3143,7 @@ msgstr "Je hebt jouw limiet van %1$.0f berichten bereikt."
 msgid "You have reached your limit of %1$.0f webpages."
 msgstr "Je hebt jouw limiet van %1$.0f webpagina's bereikt."
 
-#: ../../Zotlabs/Module/Layouts.php:181 ../../include/text.php:2279
+#: ../../Zotlabs/Module/Layouts.php:181 ../../include/text.php:2252
 msgid "Layouts"
 msgstr "Lay-outs"
 
@@ -3214,12 +3196,12 @@ msgstr "Vorige actie omgedraaid"
 
 #: ../../Zotlabs/Module/Like.php:371 ../../Zotlabs/Module/Subthread.php:87
 #: ../../Zotlabs/Module/Tagger.php:47 ../../include/conversation.php:120
-#: ../../include/text.php:1952
+#: ../../include/text.php:1925
 msgid "photo"
 msgstr "foto"
 
 #: ../../Zotlabs/Module/Like.php:371 ../../Zotlabs/Module/Subthread.php:87
-#: ../../include/conversation.php:148 ../../include/text.php:1958
+#: ../../include/conversation.php:148 ../../include/text.php:1931
 msgid "status"
 msgstr "bericht"
 
@@ -3355,7 +3337,7 @@ msgid ""
 "Password reset failed."
 msgstr "Het verzoek kon niet worden geverifieerd. (Mogelijk heb je al eerder een verzoek ingediend.) Opnieuw instellen van wachtwoord is mislukt."
 
-#: ../../Zotlabs/Module/Lostpass.php:90 ../../boot.php:1637
+#: ../../Zotlabs/Module/Lostpass.php:90 ../../boot.php:1703
 msgid "Password Reset"
 msgstr "Wachtwoord vergeten?"
 
@@ -3404,7 +3386,7 @@ msgstr "E-mailadres"
 msgid "Reset"
 msgstr "Opnieuw instellen"
 
-#: ../../Zotlabs/Module/Magic.php:73
+#: ../../Zotlabs/Module/Magic.php:71
 msgid "Hub not found."
 msgstr "Hub niet gevonden."
 
@@ -3412,95 +3394,95 @@ msgstr "Hub niet gevonden."
 msgid "Unable to lookup recipient."
 msgstr "Niet in staat om ontvanger op te zoeken."
 
-#: ../../Zotlabs/Module/Mail.php:46
+#: ../../Zotlabs/Module/Mail.php:45
 msgid "Unable to communicate with requested channel."
 msgstr "Niet in staat om met het aangevraagde kanaal te communiceren."
 
-#: ../../Zotlabs/Module/Mail.php:53
+#: ../../Zotlabs/Module/Mail.php:52
 msgid "Cannot verify requested channel."
 msgstr "Kan opgevraagd kanaal niet verifieren"
 
-#: ../../Zotlabs/Module/Mail.php:79
+#: ../../Zotlabs/Module/Mail.php:78
 msgid "Selected channel has private message restrictions. Send failed."
 msgstr "Gekozen kanaal heeft restricties voor privéberichten. Verzenden mislukt."
 
-#: ../../Zotlabs/Module/Mail.php:144
+#: ../../Zotlabs/Module/Mail.php:143
 msgid "Messages"
 msgstr "Berichten"
 
-#: ../../Zotlabs/Module/Mail.php:179
+#: ../../Zotlabs/Module/Mail.php:178
 msgid "Message recalled."
 msgstr "Bericht ingetrokken."
 
-#: ../../Zotlabs/Module/Mail.php:192
+#: ../../Zotlabs/Module/Mail.php:191
 msgid "Conversation removed."
 msgstr "Conversatie verwijderd"
 
-#: ../../Zotlabs/Module/Mail.php:207 ../../Zotlabs/Module/Mail.php:321
+#: ../../Zotlabs/Module/Mail.php:206 ../../Zotlabs/Module/Mail.php:315
 msgid "Expires YYYY-MM-DD HH:MM"
 msgstr "Verloopt op DD-MM-YYYY om HH:MM"
 
-#: ../../Zotlabs/Module/Mail.php:235
+#: ../../Zotlabs/Module/Mail.php:234
 msgid "Requested channel is not in this network"
 msgstr "Opgevraagd kanaal is niet in dit netwerk beschikbaar"
 
-#: ../../Zotlabs/Module/Mail.php:243
+#: ../../Zotlabs/Module/Mail.php:242
 msgid "Send Private Message"
 msgstr "Privébericht versturen"
 
-#: ../../Zotlabs/Module/Mail.php:244 ../../Zotlabs/Module/Mail.php:374
+#: ../../Zotlabs/Module/Mail.php:243 ../../Zotlabs/Module/Mail.php:368
 msgid "To:"
 msgstr "Aan:"
 
-#: ../../Zotlabs/Module/Mail.php:247 ../../Zotlabs/Module/Mail.php:376
+#: ../../Zotlabs/Module/Mail.php:246 ../../Zotlabs/Module/Mail.php:370
 msgid "Subject:"
 msgstr "Onderwerp:"
 
-#: ../../Zotlabs/Module/Mail.php:252 ../../Zotlabs/Module/Mail.php:382
-#: ../../include/conversation.php:1226
+#: ../../Zotlabs/Module/Mail.php:251 ../../Zotlabs/Module/Mail.php:376
+#: ../../include/conversation.php:1220
 msgid "Attach file"
 msgstr "Bestand toevoegen"
 
-#: ../../Zotlabs/Module/Mail.php:254
+#: ../../Zotlabs/Module/Mail.php:253
 msgid "Send"
 msgstr "Verzenden"
 
-#: ../../Zotlabs/Module/Mail.php:257 ../../Zotlabs/Module/Mail.php:387
-#: ../../include/conversation.php:1257
+#: ../../Zotlabs/Module/Mail.php:256 ../../Zotlabs/Module/Mail.php:381
+#: ../../include/conversation.php:1251
 msgid "Set expiration date"
 msgstr "Verloopdatum instellen"
 
-#: ../../Zotlabs/Module/Mail.php:346
+#: ../../Zotlabs/Module/Mail.php:340
 msgid "Delete message"
 msgstr "Bericht verwijderen"
 
-#: ../../Zotlabs/Module/Mail.php:347
+#: ../../Zotlabs/Module/Mail.php:341
 msgid "Delivery report"
 msgstr "Afleveringsrapport"
 
-#: ../../Zotlabs/Module/Mail.php:348
+#: ../../Zotlabs/Module/Mail.php:342
 msgid "Recall message"
 msgstr "Bericht intrekken"
 
-#: ../../Zotlabs/Module/Mail.php:350
+#: ../../Zotlabs/Module/Mail.php:344
 msgid "Message has been recalled."
 msgstr "Bericht is ingetrokken."
 
-#: ../../Zotlabs/Module/Mail.php:367
+#: ../../Zotlabs/Module/Mail.php:361
 msgid "Delete Conversation"
 msgstr "Verwijder conversatie"
 
-#: ../../Zotlabs/Module/Mail.php:369
+#: ../../Zotlabs/Module/Mail.php:363
 msgid ""
 "No secure communications available. You <strong>may</strong> be able to "
 "respond from the sender's profile page."
 msgstr "Geen veilige communicatie beschikbaar. <strong>Mogelijk</strong> kan je reageren op de kanaalpagina van de afzender."
 
-#: ../../Zotlabs/Module/Mail.php:373
+#: ../../Zotlabs/Module/Mail.php:367
 msgid "Send Reply"
 msgstr "Antwoord versturen"
 
-#: ../../Zotlabs/Module/Mail.php:378
+#: ../../Zotlabs/Module/Mail.php:372
 #, php-format
 msgid "Your message for %s (%s):"
 msgstr "Jouw privébericht aan %s (%s):"
@@ -3515,8 +3497,8 @@ msgstr "Je hebt %1$.0f van totaal %2$.0f toegestane kanalen aangemaakt."
 msgid "Create a new channel"
 msgstr "Nieuw kanaal aanmaken"
 
-#: ../../Zotlabs/Module/Manage.php:164 ../../include/nav.php:206
-#: ../../include/apps.php:164
+#: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:213
+#: ../../include/nav.php:206
 msgid "Channel Manager"
 msgstr "Kanaalbeheer"
 
@@ -3602,7 +3584,7 @@ msgstr "Menu kan gebruikt worden om bladwijzers in op te slaan"
 msgid "Submit and proceed"
 msgstr "Opslaan en doorgaan"
 
-#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2278
+#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2251
 msgid "Menus"
 msgstr "Menu's"
 
@@ -3786,7 +3768,7 @@ msgctxt "mood"
 msgid "%1$s is %2$s"
 msgstr "%1$s is %2$s"
 
-#: ../../Zotlabs/Module/Mood.php:135 ../../include/apps.php:176
+#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:225
 msgid "Mood"
 msgstr "Stemming"
 
@@ -3967,7 +3949,7 @@ msgstr "Informatie over de pagina-eigenaar werd niet ontvangen."
 #: ../../Zotlabs/Module/Profile_photo.php:114
 #: ../../Zotlabs/Module/Profile_photo.php:206
 #: ../../Zotlabs/Module/Profile_photo.php:294
-#: ../../include/photo/photo_driver.php:722
+#: ../../include/photo/photo_driver.php:718
 msgid "Profile Photos"
 msgstr "Profielfoto's"
 
@@ -4037,7 +4019,7 @@ msgid "Album name could not be decoded"
 msgstr "Albumnaam kon niet gedecodeerd worden"
 
 #: ../../Zotlabs/Module/Photos.php:743 ../../Zotlabs/Module/Photos.php:1284
-#: ../../Zotlabs/Module/Photos.php:1301
+#: ../../Zotlabs/Module/Photos.php:1302
 msgid "Contact Photos"
 msgstr "Connectiefoto's"
 
@@ -4049,12 +4031,12 @@ msgstr "Nieuwste eerst weergeven"
 msgid "Show Oldest First"
 msgstr "Oudste eerst weergeven"
 
-#: ../../Zotlabs/Module/Photos.php:792 ../../Zotlabs/Module/Photos.php:1334
-#: ../../include/widgets.php:1500
+#: ../../Zotlabs/Module/Photos.php:792 ../../Zotlabs/Module/Photos.php:1335
+#: ../../include/widgets.php:1497
 msgid "View Photo"
 msgstr "Foto weergeven"
 
-#: ../../Zotlabs/Module/Photos.php:823 ../../include/widgets.php:1517
+#: ../../Zotlabs/Module/Photos.php:823 ../../include/widgets.php:1514
 msgid "Edit Album"
 msgstr "Album bewerken"
 
@@ -4118,26 +4100,26 @@ msgstr "Voorbeeld: @bob, @Barbara_Jansen, @jan@voorbeeld.nl"
 msgid "Flag as adult in album view"
 msgstr "Markeer als voor volwassenen in albumweergave"
 
-#: ../../Zotlabs/Module/Photos.php:1070 ../../include/ItemObject.php:254
+#: ../../Zotlabs/Module/Photos.php:1070 ../../Zotlabs/Lib/ThreadItem.php:251
 msgid "I like this (toggle)"
 msgstr "Vind ik leuk"
 
-#: ../../Zotlabs/Module/Photos.php:1071 ../../include/ItemObject.php:255
+#: ../../Zotlabs/Module/Photos.php:1071 ../../Zotlabs/Lib/ThreadItem.php:252
 msgid "I don't like this (toggle)"
 msgstr "Vind ik niet leuk"
 
-#: ../../Zotlabs/Module/Photos.php:1073 ../../include/ItemObject.php:389
+#: ../../Zotlabs/Module/Photos.php:1073 ../../Zotlabs/Lib/ThreadItem.php:386
 #: ../../include/conversation.php:740
 msgid "Please wait"
 msgstr "Even wachten"
 
 #: ../../Zotlabs/Module/Photos.php:1089 ../../Zotlabs/Module/Photos.php:1207
-#: ../../include/ItemObject.php:700
+#: ../../Zotlabs/Lib/ThreadItem.php:696
 msgid "This is you"
 msgstr "Dit ben jij"
 
 #: ../../Zotlabs/Module/Photos.php:1091 ../../Zotlabs/Module/Photos.php:1209
-#: ../../include/ItemObject.php:702 ../../include/js_strings.php:6
+#: ../../Zotlabs/Lib/ThreadItem.php:698 ../../include/js_strings.php:6
 msgid "Comment"
 msgstr "Reactie"
 
@@ -4182,13 +4164,13 @@ msgid "Might attend"
 msgstr "mogelijk aanwezig"
 
 #: ../../Zotlabs/Module/Photos.php:1126 ../../Zotlabs/Module/Photos.php:1138
-#: ../../include/ItemObject.php:175 ../../include/ItemObject.php:187
-#: ../../include/conversation.php:1724
+#: ../../Zotlabs/Lib/ThreadItem.php:171 ../../Zotlabs/Lib/ThreadItem.php:183
+#: ../../include/conversation.php:1717
 msgid "View all"
 msgstr "Toon alles"
 
-#: ../../Zotlabs/Module/Photos.php:1130 ../../include/identity.php:1304
-#: ../../include/ItemObject.php:179 ../../include/conversation.php:1748
+#: ../../Zotlabs/Module/Photos.php:1130 ../../Zotlabs/Lib/ThreadItem.php:175
+#: ../../include/conversation.php:1741 ../../include/channel.php:1158
 #: ../../include/taxonomy.php:403
 msgctxt "noun"
 msgid "Like"
@@ -4196,8 +4178,8 @@ msgid_plural "Likes"
 msgstr[0] "vindt dit leuk"
 msgstr[1] "vinden dit leuk"
 
-#: ../../Zotlabs/Module/Photos.php:1135 ../../include/ItemObject.php:184
-#: ../../include/conversation.php:1751
+#: ../../Zotlabs/Module/Photos.php:1135 ../../Zotlabs/Lib/ThreadItem.php:180
+#: ../../include/conversation.php:1744
 msgctxt "noun"
 msgid "Dislike"
 msgid_plural "Dislikes"
@@ -4216,54 +4198,52 @@ msgstr "Op deze foto:"
 msgid "Map"
 msgstr "Kaart"
 
-#: ../../Zotlabs/Module/Photos.php:1257 ../../include/ItemObject.php:378
+#: ../../Zotlabs/Module/Photos.php:1257 ../../Zotlabs/Lib/ThreadItem.php:375
 msgctxt "noun"
 msgid "Likes"
 msgstr "vinden dit leuk"
 
-#: ../../Zotlabs/Module/Photos.php:1258 ../../include/ItemObject.php:379
+#: ../../Zotlabs/Module/Photos.php:1258 ../../Zotlabs/Lib/ThreadItem.php:376
 msgctxt "noun"
 msgid "Dislikes"
 msgstr "vinden dit niet leuk"
 
-#: ../../Zotlabs/Module/Photos.php:1263 ../../include/ItemObject.php:384
-#: ../../include/acl_selectors.php:290
+#: ../../Zotlabs/Module/Photos.php:1263 ../../Zotlabs/Lib/ThreadItem.php:381
+#: ../../include/acl_selectors.php:285
 msgid "Close"
 msgstr "Sluiten"
 
-#: ../../Zotlabs/Module/Photos.php:1340
+#: ../../Zotlabs/Module/Photos.php:1341
 msgid "View Album"
 msgstr "Album weergeven"
 
-#: ../../Zotlabs/Module/Photos.php:1351 ../../Zotlabs/Module/Photos.php:1364
-#: ../../Zotlabs/Module/Photos.php:1365
+#: ../../Zotlabs/Module/Photos.php:1352 ../../Zotlabs/Module/Photos.php:1365
+#: ../../Zotlabs/Module/Photos.php:1366
 msgid "Recent Photos"
 msgstr "Recente foto's"
 
-#: ../../Zotlabs/Module/Ping.php:264
+#: ../../Zotlabs/Module/Ping.php:265
 msgid "sent you a private message"
 msgstr "stuurde jou een privébericht"
 
-#: ../../Zotlabs/Module/Ping.php:312
+#: ../../Zotlabs/Module/Ping.php:313
 msgid "added your channel"
 msgstr "voegde jouw kanaal toe"
 
-#: ../../Zotlabs/Module/Ping.php:322 ../../include/identity.php:1123
-#: ../../include/identity.php:1199
+#: ../../Zotlabs/Module/Ping.php:323
 msgid "g A l F d"
 msgstr "G:i, l d F"
 
-#: ../../Zotlabs/Module/Ping.php:345 ../../include/identity.php:1169
-#: ../../include/identity.php:1239
+#: ../../Zotlabs/Module/Ping.php:346
 msgid "[today]"
 msgstr "[vandaag]"
 
-#: ../../Zotlabs/Module/Ping.php:354
+#: ../../Zotlabs/Module/Ping.php:355
 msgid "posted an event"
 msgstr "plaatste een gebeurtenis"
 
-#: ../../Zotlabs/Module/Poke.php:168 ../../include/conversation.php:965
-#: ../../include/apps.php:177
+#: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:226
+#: ../../include/conversation.php:960
 msgid "Poke"
 msgstr "Aanstoten"
 
@@ -4291,7 +4271,7 @@ msgstr "Kies wat je met de ontvanger wil doen"
 msgid "Make this post private"
 msgstr "Maak dit bericht privé"
 
-#: ../../Zotlabs/Module/Probe.php:28 ../../Zotlabs/Module/Probe.php:34
+#: ../../Zotlabs/Module/Probe.php:30 ../../Zotlabs/Module/Probe.php:34
 #, php-format
 msgid "Fetching URL returns error: %1$s"
 msgstr "Ophalen URL gaf een foutmelding terug: %1$s"
@@ -4306,270 +4286,270 @@ msgstr "Vernieuw de pagina met shift+R of shift+F5, of leeg je browserbuffer, wa
 msgid "Upload Profile Photo"
 msgstr "Profielfoto uploaden"
 
-#: ../../Zotlabs/Module/Profiles.php:23 ../../Zotlabs/Module/Profiles.php:188
-#: ../../Zotlabs/Module/Profiles.php:245 ../../Zotlabs/Module/Profiles.php:624
+#: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:189
+#: ../../Zotlabs/Module/Profiles.php:246 ../../Zotlabs/Module/Profiles.php:625
 msgid "Profile not found."
 msgstr "Profiel niet gevonden."
 
-#: ../../Zotlabs/Module/Profiles.php:43
+#: ../../Zotlabs/Module/Profiles.php:44
 msgid "Profile deleted."
 msgstr "Profiel verwijderd."
 
-#: ../../Zotlabs/Module/Profiles.php:67 ../../Zotlabs/Module/Profiles.php:103
+#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:104
 msgid "Profile-"
 msgstr "Profiel-"
 
-#: ../../Zotlabs/Module/Profiles.php:88 ../../Zotlabs/Module/Profiles.php:131
+#: ../../Zotlabs/Module/Profiles.php:89 ../../Zotlabs/Module/Profiles.php:132
 msgid "New profile created."
 msgstr "Nieuw profiel aangemaakt."
 
-#: ../../Zotlabs/Module/Profiles.php:109
+#: ../../Zotlabs/Module/Profiles.php:110
 msgid "Profile unavailable to clone."
 msgstr "Profiel niet beschikbaar om te klonen"
 
-#: ../../Zotlabs/Module/Profiles.php:150
+#: ../../Zotlabs/Module/Profiles.php:151
 msgid "Profile unavailable to export."
 msgstr "Geen profiel beschikbaar om te exporteren"
 
-#: ../../Zotlabs/Module/Profiles.php:255
+#: ../../Zotlabs/Module/Profiles.php:256
 msgid "Profile Name is required."
 msgstr "Profielnaam is vereist"
 
-#: ../../Zotlabs/Module/Profiles.php:426
+#: ../../Zotlabs/Module/Profiles.php:427
 msgid "Marital Status"
 msgstr "Huwelijke status"
 
-#: ../../Zotlabs/Module/Profiles.php:430
+#: ../../Zotlabs/Module/Profiles.php:431
 msgid "Romantic Partner"
 msgstr "Romantische partner"
 
-#: ../../Zotlabs/Module/Profiles.php:434 ../../Zotlabs/Module/Profiles.php:740
+#: ../../Zotlabs/Module/Profiles.php:435 ../../Zotlabs/Module/Profiles.php:736
 msgid "Likes"
 msgstr "Houdt van"
 
-#: ../../Zotlabs/Module/Profiles.php:438 ../../Zotlabs/Module/Profiles.php:741
+#: ../../Zotlabs/Module/Profiles.php:439 ../../Zotlabs/Module/Profiles.php:737
 msgid "Dislikes"
 msgstr "Houdt niet van"
 
-#: ../../Zotlabs/Module/Profiles.php:442 ../../Zotlabs/Module/Profiles.php:748
+#: ../../Zotlabs/Module/Profiles.php:443 ../../Zotlabs/Module/Profiles.php:744
 msgid "Work/Employment"
 msgstr "Werk/arbeid"
 
-#: ../../Zotlabs/Module/Profiles.php:445
+#: ../../Zotlabs/Module/Profiles.php:446
 msgid "Religion"
 msgstr "Religie"
 
-#: ../../Zotlabs/Module/Profiles.php:449
+#: ../../Zotlabs/Module/Profiles.php:450
 msgid "Political Views"
 msgstr "Politieke overtuigingen"
 
-#: ../../Zotlabs/Module/Profiles.php:457
+#: ../../Zotlabs/Module/Profiles.php:458
 msgid "Sexual Preference"
 msgstr "Seksuele voorkeur"
 
-#: ../../Zotlabs/Module/Profiles.php:461
+#: ../../Zotlabs/Module/Profiles.php:462
 msgid "Homepage"
 msgstr "Homepage"
 
-#: ../../Zotlabs/Module/Profiles.php:465
+#: ../../Zotlabs/Module/Profiles.php:466
 msgid "Interests"
 msgstr "Interesses"
 
-#: ../../Zotlabs/Module/Profiles.php:559
+#: ../../Zotlabs/Module/Profiles.php:560
 msgid "Profile updated."
 msgstr "Profiel bijgewerkt"
 
-#: ../../Zotlabs/Module/Profiles.php:648
+#: ../../Zotlabs/Module/Profiles.php:644
 msgid "Hide your connections list from viewers of this profile"
 msgstr "Laat de lijst met connecties niet aan bezoekers van dit profiel zien."
 
-#: ../../Zotlabs/Module/Profiles.php:690
+#: ../../Zotlabs/Module/Profiles.php:686
 msgid "Edit Profile Details"
 msgstr "Profiel bewerken"
 
-#: ../../Zotlabs/Module/Profiles.php:692
+#: ../../Zotlabs/Module/Profiles.php:688
 msgid "View this profile"
 msgstr "Profiel weergeven"
 
-#: ../../Zotlabs/Module/Profiles.php:693 ../../Zotlabs/Module/Profiles.php:775
-#: ../../include/identity.php:959
+#: ../../Zotlabs/Module/Profiles.php:689 ../../Zotlabs/Module/Profiles.php:771
+#: ../../include/channel.php:959
 msgid "Edit visibility"
 msgstr "Zichtbaarheid bewerken"
 
-#: ../../Zotlabs/Module/Profiles.php:694
+#: ../../Zotlabs/Module/Profiles.php:690
 msgid "Profile Tools"
 msgstr "Hulpmiddelen"
 
-#: ../../Zotlabs/Module/Profiles.php:695
+#: ../../Zotlabs/Module/Profiles.php:691
 msgid "Change cover photo"
 msgstr "Omslagfoto wijzigen"
 
-#: ../../Zotlabs/Module/Profiles.php:696 ../../include/identity.php:930
+#: ../../Zotlabs/Module/Profiles.php:692 ../../include/channel.php:930
 msgid "Change profile photo"
 msgstr "Profielfoto veranderen"
 
-#: ../../Zotlabs/Module/Profiles.php:697
+#: ../../Zotlabs/Module/Profiles.php:693
 msgid "Create a new profile using these settings"
 msgstr "Een nieuw profiel aanmaken met dit profiel als basis"
 
-#: ../../Zotlabs/Module/Profiles.php:698
+#: ../../Zotlabs/Module/Profiles.php:694
 msgid "Clone this profile"
 msgstr "Dit profiel klonen"
 
-#: ../../Zotlabs/Module/Profiles.php:699
+#: ../../Zotlabs/Module/Profiles.php:695
 msgid "Delete this profile"
 msgstr "Dit profiel verwijderen"
 
-#: ../../Zotlabs/Module/Profiles.php:700
+#: ../../Zotlabs/Module/Profiles.php:696
 msgid "Add profile things"
 msgstr "Dingen aan je profiel toevoegen"
 
-#: ../../Zotlabs/Module/Profiles.php:701 ../../include/widgets.php:105
-#: ../../include/conversation.php:1532
+#: ../../Zotlabs/Module/Profiles.php:697 ../../include/conversation.php:1526
+#: ../../include/widgets.php:105
 msgid "Personal"
 msgstr "Persoonlijk"
 
-#: ../../Zotlabs/Module/Profiles.php:703
+#: ../../Zotlabs/Module/Profiles.php:699
 msgid "Relation"
 msgstr "Relatie"
 
-#: ../../Zotlabs/Module/Profiles.php:704 ../../include/datetime.php:48
+#: ../../Zotlabs/Module/Profiles.php:700 ../../include/datetime.php:48
 msgid "Miscellaneous"
 msgstr "Diversen"
 
-#: ../../Zotlabs/Module/Profiles.php:706
+#: ../../Zotlabs/Module/Profiles.php:702
 msgid "Import profile from file"
 msgstr "Profiel vanuit bestand importeren"
 
-#: ../../Zotlabs/Module/Profiles.php:707
+#: ../../Zotlabs/Module/Profiles.php:703
 msgid "Export profile to file"
 msgstr "Profiel naar bestand exporteren"
 
-#: ../../Zotlabs/Module/Profiles.php:708
+#: ../../Zotlabs/Module/Profiles.php:704
 msgid "Your gender"
 msgstr "Jouw geslacht"
 
-#: ../../Zotlabs/Module/Profiles.php:709
+#: ../../Zotlabs/Module/Profiles.php:705
 msgid "Marital status"
 msgstr "Burgerlijke staat"
 
-#: ../../Zotlabs/Module/Profiles.php:710
+#: ../../Zotlabs/Module/Profiles.php:706
 msgid "Sexual preference"
 msgstr "Seksuele voorkeur"
 
-#: ../../Zotlabs/Module/Profiles.php:713
+#: ../../Zotlabs/Module/Profiles.php:709
 msgid "Profile name"
 msgstr "Profielnaam"
 
-#: ../../Zotlabs/Module/Profiles.php:715
+#: ../../Zotlabs/Module/Profiles.php:711
 msgid "This is your default profile."
 msgstr "Dit is jouw standaardprofiel"
 
-#: ../../Zotlabs/Module/Profiles.php:717
+#: ../../Zotlabs/Module/Profiles.php:713
 msgid "Your full name"
 msgstr "Jouw volledige naam"
 
-#: ../../Zotlabs/Module/Profiles.php:718
+#: ../../Zotlabs/Module/Profiles.php:714
 msgid "Title/Description"
 msgstr "Titel/omschrijving"
 
-#: ../../Zotlabs/Module/Profiles.php:721
+#: ../../Zotlabs/Module/Profiles.php:717
 msgid "Street address"
 msgstr "Straat en huisnummer"
 
-#: ../../Zotlabs/Module/Profiles.php:722
+#: ../../Zotlabs/Module/Profiles.php:718
 msgid "Locality/City"
 msgstr "Woonplaats"
 
-#: ../../Zotlabs/Module/Profiles.php:723
+#: ../../Zotlabs/Module/Profiles.php:719
 msgid "Region/State"
 msgstr "Provincie/gewest/deelstaat"
 
-#: ../../Zotlabs/Module/Profiles.php:724
+#: ../../Zotlabs/Module/Profiles.php:720
 msgid "Postal/Zip code"
 msgstr "Postcode"
 
-#: ../../Zotlabs/Module/Profiles.php:725
+#: ../../Zotlabs/Module/Profiles.php:721
 msgid "Country"
 msgstr "Land"
 
-#: ../../Zotlabs/Module/Profiles.php:730
+#: ../../Zotlabs/Module/Profiles.php:726
 msgid "Who (if applicable)"
 msgstr "Wie (wanneer van toepassing)"
 
-#: ../../Zotlabs/Module/Profiles.php:730
+#: ../../Zotlabs/Module/Profiles.php:726
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr "Voorbeelden: petra123, Petra Jansen, petra@voorbeeld.nl"
 
-#: ../../Zotlabs/Module/Profiles.php:731
+#: ../../Zotlabs/Module/Profiles.php:727
 msgid "Since (date)"
 msgstr "Sinds (datum)"
 
-#: ../../Zotlabs/Module/Profiles.php:734
+#: ../../Zotlabs/Module/Profiles.php:730
 msgid "Tell us about yourself"
 msgstr "Vertel ons iets over jezelf"
 
-#: ../../Zotlabs/Module/Profiles.php:736
+#: ../../Zotlabs/Module/Profiles.php:732
 msgid "Hometown"
 msgstr "Oorspronkelijk uit"
 
-#: ../../Zotlabs/Module/Profiles.php:737
+#: ../../Zotlabs/Module/Profiles.php:733
 msgid "Political views"
 msgstr "Politieke overtuigingen"
 
-#: ../../Zotlabs/Module/Profiles.php:738
+#: ../../Zotlabs/Module/Profiles.php:734
 msgid "Religious views"
 msgstr "Religieuze overtuigingen"
 
-#: ../../Zotlabs/Module/Profiles.php:739
+#: ../../Zotlabs/Module/Profiles.php:735
 msgid "Keywords used in directory listings"
 msgstr "Trefwoorden voor in de kanalengids"
 
-#: ../../Zotlabs/Module/Profiles.php:739
+#: ../../Zotlabs/Module/Profiles.php:735
 msgid "Example: fishing photography software"
 msgstr "Voorbeeld: muziek, fotografie, software"
 
-#: ../../Zotlabs/Module/Profiles.php:742
+#: ../../Zotlabs/Module/Profiles.php:738
 msgid "Musical interests"
 msgstr "Muzikale interesses"
 
-#: ../../Zotlabs/Module/Profiles.php:743
+#: ../../Zotlabs/Module/Profiles.php:739
 msgid "Books, literature"
 msgstr "Boeken/literatuur"
 
-#: ../../Zotlabs/Module/Profiles.php:744
+#: ../../Zotlabs/Module/Profiles.php:740
 msgid "Television"
 msgstr "Televisie"
 
-#: ../../Zotlabs/Module/Profiles.php:745
+#: ../../Zotlabs/Module/Profiles.php:741
 msgid "Film/Dance/Culture/Entertainment"
 msgstr "Film/dans/cultuur/entertainment"
 
-#: ../../Zotlabs/Module/Profiles.php:746
+#: ../../Zotlabs/Module/Profiles.php:742
 msgid "Hobbies/Interests"
 msgstr "Hobby's/interesses"
 
-#: ../../Zotlabs/Module/Profiles.php:747
+#: ../../Zotlabs/Module/Profiles.php:743
 msgid "Love/Romance"
 msgstr "Liefde/romantiek"
 
-#: ../../Zotlabs/Module/Profiles.php:749
+#: ../../Zotlabs/Module/Profiles.php:745
 msgid "School/Education"
 msgstr "School/opleiding"
 
-#: ../../Zotlabs/Module/Profiles.php:750
+#: ../../Zotlabs/Module/Profiles.php:746
 msgid "Contact information and social networks"
 msgstr "Contactinformatie en sociale netwerken"
 
-#: ../../Zotlabs/Module/Profiles.php:751
+#: ../../Zotlabs/Module/Profiles.php:747
 msgid "My other channels"
 msgstr "Mijn andere kanalen"
 
-#: ../../Zotlabs/Module/Profiles.php:771 ../../include/identity.php:955
+#: ../../Zotlabs/Module/Profiles.php:767 ../../include/channel.php:955
 msgid "Profile Image"
 msgstr "Profielfoto"
 
-#: ../../Zotlabs/Module/Profiles.php:781 ../../include/identity.php:937
+#: ../../Zotlabs/Module/Profiles.php:777 ../../include/channel.php:937
 #: ../../include/nav.php:88
 msgid "Edit Profiles"
 msgstr "Bewerk profielen"
@@ -4582,7 +4562,7 @@ msgstr "Ongeldige profiel-identificator"
 msgid "Profile Visibility Editor"
 msgstr "Zichtbaarheid profiel "
 
-#: ../../Zotlabs/Module/Profperm.php:117 ../../include/identity.php:1395
+#: ../../Zotlabs/Module/Profperm.php:117 ../../include/channel.php:1249
 msgid "Profile"
 msgstr "Profiel"
 
@@ -4594,7 +4574,7 @@ msgstr "Klik op een connectie om deze toe te voegen of te verwijderen"
 msgid "Visible To"
 msgstr "Zichtbaar voor"
 
-#: ../../Zotlabs/Module/Pubsites.php:22 ../../include/widgets.php:1271
+#: ../../Zotlabs/Module/Pubsites.php:22 ../../include/widgets.php:1268
 msgid "Public Hubs"
 msgstr "Openbare hubs"
 
@@ -4620,15 +4600,19 @@ msgid "Registration Policy"
 msgstr "Registratie-<br/>&nbsp;beleid"
 
 #: ../../Zotlabs/Module/Pubsites.php:31
+msgid "Stats"
+msgstr "Stats"
+
+#: ../../Zotlabs/Module/Pubsites.php:31
 msgid "Software"
 msgstr "Software"
 
 #: ../../Zotlabs/Module/Pubsites.php:31 ../../Zotlabs/Module/Ratings.php:103
-#: ../../include/conversation.php:964
+#: ../../include/conversation.php:959
 msgid "Ratings"
 msgstr "Beoordelingen"
 
-#: ../../Zotlabs/Module/Pubsites.php:37
+#: ../../Zotlabs/Module/Pubsites.php:38
 msgid "Rate"
 msgstr "Beoordeel"
 
@@ -4769,7 +4753,7 @@ msgid "Membership on this site is by invitation only."
 msgstr "Registreren op deze $Projectname-hub kan alleen op uitnodiging."
 
 #: ../../Zotlabs/Module/Register.php:262 ../../include/nav.php:147
-#: ../../boot.php:1611
+#: ../../boot.php:1677
 msgid "Register"
 msgstr "Registreren"
 
@@ -4787,44 +4771,44 @@ msgid ""
 "password."
 msgstr "Het verwijderen van een account is niet toegestaan binnen 48 uur nadat het wachtwoord is veranderd."
 
-#: ../../Zotlabs/Module/Removeaccount.php:61
+#: ../../Zotlabs/Module/Removeaccount.php:56
 msgid "Remove This Account"
 msgstr "Verwijder dit account"
 
-#: ../../Zotlabs/Module/Removeaccount.php:62
-#: ../../Zotlabs/Module/Removeme.php:62
+#: ../../Zotlabs/Module/Removeaccount.php:57
+#: ../../Zotlabs/Module/Removeme.php:59
 msgid "WARNING: "
 msgstr "WAARSCHUWING: "
 
-#: ../../Zotlabs/Module/Removeaccount.php:62
+#: ../../Zotlabs/Module/Removeaccount.php:57
 msgid ""
 "This account and all its channels will be completely removed from the "
 "network. "
 msgstr "Dit account en al zijn kanalen worden volledig uit het $Projectname-netwerk verwijderd."
 
-#: ../../Zotlabs/Module/Removeaccount.php:62
-#: ../../Zotlabs/Module/Removeme.php:62
+#: ../../Zotlabs/Module/Removeaccount.php:57
+#: ../../Zotlabs/Module/Removeme.php:59
 msgid "This action is permanent and can not be undone!"
 msgstr "Deze handeling is van permanente aard en kan niet meer worden teruggedraaid!"
 
-#: ../../Zotlabs/Module/Removeaccount.php:63
-#: ../../Zotlabs/Module/Removeme.php:63
+#: ../../Zotlabs/Module/Removeaccount.php:58
+#: ../../Zotlabs/Module/Removeme.php:60
 msgid "Please enter your password for verification:"
 msgstr "Vul je wachtwoord in ter verificatie:"
 
-#: ../../Zotlabs/Module/Removeaccount.php:64
+#: ../../Zotlabs/Module/Removeaccount.php:59
 msgid ""
 "Remove this account, all its channels and all its channel clones from the "
 "network"
 msgstr "Dit account, al zijn kanalen en alle klonen van zijn kanalen uit het $Projectname-netwerk verwijderen"
 
-#: ../../Zotlabs/Module/Removeaccount.php:64
+#: ../../Zotlabs/Module/Removeaccount.php:59
 msgid ""
 "By default only the instances of the channels located on this hub will be "
 "removed from the network"
 msgstr "Standaard worden alleen de kanalen die zich op deze hub bevinden uit het $Projectname-netwerk verwijderd"
 
-#: ../../Zotlabs/Module/Removeaccount.php:65
+#: ../../Zotlabs/Module/Removeaccount.php:60
 #: ../../Zotlabs/Module/Settings.php:705
 msgid "Remove Account"
 msgstr "Account verwijderen"
@@ -4835,25 +4819,25 @@ msgid ""
 "password."
 msgstr "Het verwijderen van een kanaal is niet toegestaan binnen 48 uur nadat het wachtwoord van het account is veranderd."
 
-#: ../../Zotlabs/Module/Removeme.php:61
+#: ../../Zotlabs/Module/Removeme.php:58
 msgid "Remove This Channel"
 msgstr "Verwijder dit kanaal"
 
-#: ../../Zotlabs/Module/Removeme.php:62
+#: ../../Zotlabs/Module/Removeme.php:59
 msgid "This channel will be completely removed from the network. "
 msgstr "Dit kanaal wordt volledig uit het $Projectname-netwerk verwijderd."
 
-#: ../../Zotlabs/Module/Removeme.php:64
+#: ../../Zotlabs/Module/Removeme.php:61
 msgid "Remove this channel and all its clones from the network"
 msgstr "Dit kanaal en alle klonen hiervan uit het $Projectname-netwerk verwijderen"
 
-#: ../../Zotlabs/Module/Removeme.php:64
+#: ../../Zotlabs/Module/Removeme.php:61
 msgid ""
 "By default only the instance of the channel located on this hub will be "
 "removed from the network"
 msgstr "Standaard wordt alleen het kanaal dat zich op deze hub bevindt uit het $Projectname-netwerk verwijderd"
 
-#: ../../Zotlabs/Module/Removeme.php:65 ../../Zotlabs/Module/Settings.php:1124
+#: ../../Zotlabs/Module/Removeme.php:62 ../../Zotlabs/Module/Settings.php:1124
 msgid "Remove Channel"
 msgstr "Kanaal verwijderen"
 
@@ -5197,7 +5181,7 @@ msgstr "Kanaal-instellingen"
 msgid "Basic Settings"
 msgstr "Basis-instellingen"
 
-#: ../../Zotlabs/Module/Settings.php:1040 ../../include/identity.php:1286
+#: ../../Zotlabs/Module/Settings.php:1040 ../../include/channel.php:1140
 msgid "Full Name:"
 msgstr "Volledige naam:"
 
@@ -5503,428 +5487,428 @@ msgstr "$Projectname-service voor Firefox Share"
 msgid "Start calendar week on monday"
 msgstr "Begin in de agenda de week op maandag"
 
-#: ../../Zotlabs/Module/Setup.php:202
+#: ../../Zotlabs/Module/Setup.php:179
 msgid "$Projectname Server - Setup"
 msgstr "$Projectname Hub - Setup"
 
-#: ../../Zotlabs/Module/Setup.php:206
+#: ../../Zotlabs/Module/Setup.php:183
 msgid "Could not connect to database."
 msgstr "Could not connect to database."
 
-#: ../../Zotlabs/Module/Setup.php:210
+#: ../../Zotlabs/Module/Setup.php:187
 msgid ""
 "Could not connect to specified site URL. Possible SSL certificate or DNS "
 "issue."
 msgstr "Could not connect to specified hub URL. Possible SSL certificate or DNS issue."
 
-#: ../../Zotlabs/Module/Setup.php:217
+#: ../../Zotlabs/Module/Setup.php:194
 msgid "Could not create table."
 msgstr "Could not create table."
 
-#: ../../Zotlabs/Module/Setup.php:222
+#: ../../Zotlabs/Module/Setup.php:199
 msgid "Your site database has been installed."
 msgstr "Your hub database has been installed."
 
-#: ../../Zotlabs/Module/Setup.php:226
+#: ../../Zotlabs/Module/Setup.php:203
 msgid ""
 "You may need to import the file \"install/schema_xxx.sql\" manually using a "
 "database client."
 msgstr "You may need to import the file \"install/schema_xxx.sql\" manually using a database client."
 
-#: ../../Zotlabs/Module/Setup.php:227 ../../Zotlabs/Module/Setup.php:289
-#: ../../Zotlabs/Module/Setup.php:744
+#: ../../Zotlabs/Module/Setup.php:204 ../../Zotlabs/Module/Setup.php:266
+#: ../../Zotlabs/Module/Setup.php:721
 msgid "Please see the file \"install/INSTALL.txt\"."
 msgstr "Please see the file \"install/INSTALL.txt\"."
 
-#: ../../Zotlabs/Module/Setup.php:286
+#: ../../Zotlabs/Module/Setup.php:263
 msgid "System check"
 msgstr "System check"
 
-#: ../../Zotlabs/Module/Setup.php:291
+#: ../../Zotlabs/Module/Setup.php:268
 msgid "Check again"
 msgstr "Check again"
 
-#: ../../Zotlabs/Module/Setup.php:313
+#: ../../Zotlabs/Module/Setup.php:290
 msgid "Database connection"
 msgstr "Database connection"
 
-#: ../../Zotlabs/Module/Setup.php:314
+#: ../../Zotlabs/Module/Setup.php:291
 msgid ""
 "In order to install $Projectname we need to know how to connect to your "
 "database."
 msgstr "In order to install $Projectname we need to know how to connect to your database."
 
-#: ../../Zotlabs/Module/Setup.php:315
+#: ../../Zotlabs/Module/Setup.php:292
 msgid ""
 "Please contact your hosting provider or site administrator if you have "
 "questions about these settings."
 msgstr "Please contact your hosting provider or server administrator if you have questions about these settings."
 
-#: ../../Zotlabs/Module/Setup.php:316
+#: ../../Zotlabs/Module/Setup.php:293
 msgid ""
 "The database you specify below should already exist. If it does not, please "
 "create it before continuing."
 msgstr "The database you specify below should already exist. If it does not, please create it before continuing."
 
-#: ../../Zotlabs/Module/Setup.php:320
+#: ../../Zotlabs/Module/Setup.php:297
 msgid "Database Server Name"
 msgstr "Database Server Name"
 
-#: ../../Zotlabs/Module/Setup.php:320
+#: ../../Zotlabs/Module/Setup.php:297
 msgid "Default is 127.0.0.1"
 msgstr "Default is 127.0.0.1"
 
-#: ../../Zotlabs/Module/Setup.php:321
+#: ../../Zotlabs/Module/Setup.php:298
 msgid "Database Port"
 msgstr "Database Port"
 
-#: ../../Zotlabs/Module/Setup.php:321
+#: ../../Zotlabs/Module/Setup.php:298
 msgid "Communication port number - use 0 for default"
 msgstr "Communication port number - use 0 for default"
 
-#: ../../Zotlabs/Module/Setup.php:322
+#: ../../Zotlabs/Module/Setup.php:299
 msgid "Database Login Name"
 msgstr "Database Login Name"
 
-#: ../../Zotlabs/Module/Setup.php:323
+#: ../../Zotlabs/Module/Setup.php:300
 msgid "Database Login Password"
 msgstr "Database Login Password"
 
-#: ../../Zotlabs/Module/Setup.php:324
+#: ../../Zotlabs/Module/Setup.php:301
 msgid "Database Name"
 msgstr "Database Name"
 
-#: ../../Zotlabs/Module/Setup.php:325
+#: ../../Zotlabs/Module/Setup.php:302
 msgid "Database Type"
 msgstr "Database Type"
 
-#: ../../Zotlabs/Module/Setup.php:327 ../../Zotlabs/Module/Setup.php:367
+#: ../../Zotlabs/Module/Setup.php:304 ../../Zotlabs/Module/Setup.php:344
 msgid "Site administrator email address"
 msgstr "Hub administrator email address"
 
-#: ../../Zotlabs/Module/Setup.php:327 ../../Zotlabs/Module/Setup.php:367
+#: ../../Zotlabs/Module/Setup.php:304 ../../Zotlabs/Module/Setup.php:344
 msgid ""
 "Your account email address must match this in order to use the web admin "
 "panel."
 msgstr "Your account email address must match this in order to use the web admin panel."
 
-#: ../../Zotlabs/Module/Setup.php:328 ../../Zotlabs/Module/Setup.php:369
+#: ../../Zotlabs/Module/Setup.php:305 ../../Zotlabs/Module/Setup.php:346
 msgid "Website URL"
 msgstr "Hub URL"
 
-#: ../../Zotlabs/Module/Setup.php:328 ../../Zotlabs/Module/Setup.php:369
+#: ../../Zotlabs/Module/Setup.php:305 ../../Zotlabs/Module/Setup.php:346
 msgid "Please use SSL (https) URL if available."
 msgstr "Please use SSL (https) URL if available."
 
-#: ../../Zotlabs/Module/Setup.php:329 ../../Zotlabs/Module/Setup.php:372
+#: ../../Zotlabs/Module/Setup.php:306 ../../Zotlabs/Module/Setup.php:349
 msgid "Please select a default timezone for your website"
 msgstr "Please select a default timezone for your hub"
 
-#: ../../Zotlabs/Module/Setup.php:356
+#: ../../Zotlabs/Module/Setup.php:333
 msgid "Site settings"
 msgstr "Hub settings"
 
-#: ../../Zotlabs/Module/Setup.php:370
+#: ../../Zotlabs/Module/Setup.php:347
 msgid "Enable $Projectname <strong>advanced</strong> features?"
 msgstr "Enable $Projectname <strong>advanced</strong> features?"
 
-#: ../../Zotlabs/Module/Setup.php:370
+#: ../../Zotlabs/Module/Setup.php:347
 msgid ""
 "Some advanced features, while useful - may be best suited for technically "
 "proficient audiences"
 msgstr "Some advanced features, while useful - may be best suited for technically proficient audiences"
 
-#: ../../Zotlabs/Module/Setup.php:411
-msgid "PHP version 5.4 or greater is required."
-msgstr "PHP version 5.4 or greater is required."
+#: ../../Zotlabs/Module/Setup.php:388
+msgid "PHP version 5.5 or greater is required."
+msgstr "PHP version 5.5 or greater is required."
 
-#: ../../Zotlabs/Module/Setup.php:412
+#: ../../Zotlabs/Module/Setup.php:389
 msgid "PHP version"
 msgstr "PHP version"
 
-#: ../../Zotlabs/Module/Setup.php:427
+#: ../../Zotlabs/Module/Setup.php:404
 msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr "Could not find a command line version of PHP in the web server PATH."
 
-#: ../../Zotlabs/Module/Setup.php:428
+#: ../../Zotlabs/Module/Setup.php:405
 msgid ""
 "If you don't have a command line version of PHP installed on server, you "
 "will not be able to run background polling via cron."
 msgstr "If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron."
 
-#: ../../Zotlabs/Module/Setup.php:432
+#: ../../Zotlabs/Module/Setup.php:409
 msgid "PHP executable path"
 msgstr "PHP executable path"
 
-#: ../../Zotlabs/Module/Setup.php:432
+#: ../../Zotlabs/Module/Setup.php:409
 msgid ""
 "Enter full path to php executable. You can leave this blank to continue the "
 "installation."
 msgstr "Enter full path to php executable. You can leave this blank to continue the installation."
 
-#: ../../Zotlabs/Module/Setup.php:437
+#: ../../Zotlabs/Module/Setup.php:414
 msgid "Command line PHP"
 msgstr "Command line PHP"
 
-#: ../../Zotlabs/Module/Setup.php:446
+#: ../../Zotlabs/Module/Setup.php:423
 msgid ""
 "The command line version of PHP on your system does not have "
 "\"register_argc_argv\" enabled."
 msgstr "The command line version of PHP on your system does not have \"register_argc_argv\" enabled."
 
-#: ../../Zotlabs/Module/Setup.php:447
+#: ../../Zotlabs/Module/Setup.php:424
 msgid "This is required for message delivery to work."
 msgstr "This is required for message delivery to work."
 
-#: ../../Zotlabs/Module/Setup.php:450
+#: ../../Zotlabs/Module/Setup.php:427
 msgid "PHP register_argc_argv"
 msgstr "PHP register_argc_argv"
 
-#: ../../Zotlabs/Module/Setup.php:468
+#: ../../Zotlabs/Module/Setup.php:445
 #, php-format
 msgid ""
 "Your max allowed total upload size is set to %s. Maximum size of one file to"
 " upload is set to %s. You are allowed to upload up to %d files at once."
 msgstr "Your max allowed total upload size is set to %s. Maximum size of one file to upload is set to %s. You are allowed to upload up to %d files at once."
 
-#: ../../Zotlabs/Module/Setup.php:473
+#: ../../Zotlabs/Module/Setup.php:450
 msgid "You can adjust these settings in the servers php.ini."
 msgstr "You can adjust these settings in the servers php.ini."
 
-#: ../../Zotlabs/Module/Setup.php:475
+#: ../../Zotlabs/Module/Setup.php:452
 msgid "PHP upload limits"
 msgstr "PHP upload limits"
 
-#: ../../Zotlabs/Module/Setup.php:498
+#: ../../Zotlabs/Module/Setup.php:475
 msgid ""
 "Error: the \"openssl_pkey_new\" function on this system is not able to "
 "generate encryption keys"
 msgstr "Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"
 
-#: ../../Zotlabs/Module/Setup.php:499
+#: ../../Zotlabs/Module/Setup.php:476
 msgid ""
 "If running under Windows, please see "
 "\"http://www.php.net/manual/en/openssl.installation.php\"."
 msgstr "If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."
 
-#: ../../Zotlabs/Module/Setup.php:502
+#: ../../Zotlabs/Module/Setup.php:479
 msgid "Generate encryption keys"
 msgstr "Generate encryption keys"
 
-#: ../../Zotlabs/Module/Setup.php:514
+#: ../../Zotlabs/Module/Setup.php:491
 msgid "libCurl PHP module"
 msgstr "libCurl PHP module"
 
-#: ../../Zotlabs/Module/Setup.php:515
+#: ../../Zotlabs/Module/Setup.php:492
 msgid "GD graphics PHP module"
 msgstr "GD graphics PHP module"
 
-#: ../../Zotlabs/Module/Setup.php:516
+#: ../../Zotlabs/Module/Setup.php:493
 msgid "OpenSSL PHP module"
 msgstr "OpenSSL PHP module"
 
-#: ../../Zotlabs/Module/Setup.php:517
+#: ../../Zotlabs/Module/Setup.php:494
 msgid "mysqli or postgres PHP module"
 msgstr "mysqli or postgres PHP module"
 
-#: ../../Zotlabs/Module/Setup.php:518
+#: ../../Zotlabs/Module/Setup.php:495
 msgid "mb_string PHP module"
 msgstr "mb_string PHP module"
 
-#: ../../Zotlabs/Module/Setup.php:519
+#: ../../Zotlabs/Module/Setup.php:496
 msgid "mcrypt PHP module"
 msgstr "mcrypt PHP module"
 
-#: ../../Zotlabs/Module/Setup.php:520
+#: ../../Zotlabs/Module/Setup.php:497
 msgid "xml PHP module"
 msgstr "xml PHP module"
 
-#: ../../Zotlabs/Module/Setup.php:524 ../../Zotlabs/Module/Setup.php:526
+#: ../../Zotlabs/Module/Setup.php:501 ../../Zotlabs/Module/Setup.php:503
 msgid "Apache mod_rewrite module"
 msgstr "Apache mod_rewrite module"
 
-#: ../../Zotlabs/Module/Setup.php:524
+#: ../../Zotlabs/Module/Setup.php:501
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr "Error: Apache webserver mod-rewrite module is required but not installed."
 
-#: ../../Zotlabs/Module/Setup.php:530 ../../Zotlabs/Module/Setup.php:533
+#: ../../Zotlabs/Module/Setup.php:507 ../../Zotlabs/Module/Setup.php:510
 msgid "proc_open"
 msgstr "proc_open"
 
-#: ../../Zotlabs/Module/Setup.php:530
+#: ../../Zotlabs/Module/Setup.php:507
 msgid ""
 "Error: proc_open is required but is either not installed or has been "
 "disabled in php.ini"
 msgstr "Error: proc_open is required but is either not installed or has been disabled in php.ini"
 
-#: ../../Zotlabs/Module/Setup.php:538
+#: ../../Zotlabs/Module/Setup.php:515
 msgid "Error: libCURL PHP module required but not installed."
 msgstr "Error: libCURL PHP module required but not installed."
 
-#: ../../Zotlabs/Module/Setup.php:542
+#: ../../Zotlabs/Module/Setup.php:519
 msgid ""
 "Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr "Error: GD graphics PHP module with JPEG support required but not installed."
 
-#: ../../Zotlabs/Module/Setup.php:546
+#: ../../Zotlabs/Module/Setup.php:523
 msgid "Error: openssl PHP module required but not installed."
 msgstr "Error: openssl PHP module required but not installed."
 
-#: ../../Zotlabs/Module/Setup.php:550
+#: ../../Zotlabs/Module/Setup.php:527
 msgid ""
 "Error: mysqli or postgres PHP module required but neither are installed."
 msgstr "Error: mysqli or postgres PHP module required but neither are installed."
 
-#: ../../Zotlabs/Module/Setup.php:554
+#: ../../Zotlabs/Module/Setup.php:531
 msgid "Error: mb_string PHP module required but not installed."
 msgstr "Error: mb_string PHP module required but not installed."
 
-#: ../../Zotlabs/Module/Setup.php:558
+#: ../../Zotlabs/Module/Setup.php:535
 msgid "Error: mcrypt PHP module required but not installed."
 msgstr "Error: mcrypt PHP module required but not installed."
 
-#: ../../Zotlabs/Module/Setup.php:562
+#: ../../Zotlabs/Module/Setup.php:539
 msgid "Error: xml PHP module required for DAV but not installed."
 msgstr "Error: xml PHP module required for DAV but not installed."
 
-#: ../../Zotlabs/Module/Setup.php:580
+#: ../../Zotlabs/Module/Setup.php:557
 msgid ""
 "The web installer needs to be able to create a file called \".htconfig.php\""
 " in the top folder of your web server and it is unable to do so."
 msgstr "The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."
 
-#: ../../Zotlabs/Module/Setup.php:581
+#: ../../Zotlabs/Module/Setup.php:558
 msgid ""
 "This is most often a permission setting, as the web server may not be able "
 "to write files in your folder - even if you can."
 msgstr "This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."
 
-#: ../../Zotlabs/Module/Setup.php:582
+#: ../../Zotlabs/Module/Setup.php:559
 msgid ""
 "At the end of this procedure, we will give you a text to save in a file "
 "named .htconfig.php in your Red top folder."
 msgstr "At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Red top folder."
 
-#: ../../Zotlabs/Module/Setup.php:583
+#: ../../Zotlabs/Module/Setup.php:560
 msgid ""
 "You can alternatively skip this procedure and perform a manual installation."
 " Please see the file \"install/INSTALL.txt\" for instructions."
 msgstr "You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions."
 
-#: ../../Zotlabs/Module/Setup.php:586
+#: ../../Zotlabs/Module/Setup.php:563
 msgid ".htconfig.php is writable"
 msgstr ".htconfig.php is writable"
 
-#: ../../Zotlabs/Module/Setup.php:600
+#: ../../Zotlabs/Module/Setup.php:577
 msgid ""
 "Red uses the Smarty3 template engine to render its web views. Smarty3 "
 "compiles templates to PHP to speed up rendering."
 msgstr "Red uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."
 
-#: ../../Zotlabs/Module/Setup.php:601
+#: ../../Zotlabs/Module/Setup.php:578
 #, php-format
 msgid ""
 "In order to store these compiled templates, the web server needs to have "
-"write access to the directory %s under the Red top level folder."
-msgstr "In order to store these compiled templates, the web server needs to have write access to the directory %s under the Red top level folder."
+"write access to the directory %s under the top level web folder."
+msgstr "In order to store these compiled templates, the web server needs to have write access to the directory %s under the top level web folder."
 
-#: ../../Zotlabs/Module/Setup.php:602 ../../Zotlabs/Module/Setup.php:623
+#: ../../Zotlabs/Module/Setup.php:579 ../../Zotlabs/Module/Setup.php:600
 msgid ""
 "Please ensure that the user that your web server runs as (e.g. www-data) has"
 " write access to this folder."
 msgstr "Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."
 
-#: ../../Zotlabs/Module/Setup.php:603
+#: ../../Zotlabs/Module/Setup.php:580
 #, php-format
 msgid ""
 "Note: as a security measure, you should give the web server write access to "
 "%s only--not the template files (.tpl) that it contains."
 msgstr "Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains."
 
-#: ../../Zotlabs/Module/Setup.php:606
+#: ../../Zotlabs/Module/Setup.php:583
 #, php-format
 msgid "%s is writable"
 msgstr "%s is writable"
 
-#: ../../Zotlabs/Module/Setup.php:622
+#: ../../Zotlabs/Module/Setup.php:599
 msgid ""
 "Red uses the store directory to save uploaded files. The web server needs to"
 " have write access to the store directory under the Red top level folder"
 msgstr "Red uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the Red top level folder"
 
-#: ../../Zotlabs/Module/Setup.php:626
+#: ../../Zotlabs/Module/Setup.php:603
 msgid "store is writable"
 msgstr "store is writable"
 
-#: ../../Zotlabs/Module/Setup.php:659
+#: ../../Zotlabs/Module/Setup.php:636
 msgid ""
 "SSL certificate cannot be validated. Fix certificate or disable https access"
 " to this site."
 msgstr "SSL certificate cannot be validated. Fix certificate or disable https access to this hub."
 
-#: ../../Zotlabs/Module/Setup.php:660
+#: ../../Zotlabs/Module/Setup.php:637
 msgid ""
 "If you have https access to your website or allow connections to TCP port "
 "443 (the https: port), you MUST use a browser-valid certificate. You MUST "
 "NOT use self-signed certificates!"
 msgstr "If you have https access to your hub or allow connections to TCP port 443 (the https: port), you MUST use a browser-valid certificate. You MUST NOT use self-signed certificates!"
 
-#: ../../Zotlabs/Module/Setup.php:661
+#: ../../Zotlabs/Module/Setup.php:638
 msgid ""
 "This restriction is incorporated because public posts from you may for "
 "example contain references to images on your own hub."
 msgstr "This restriction is incorporated because public posts from you may for example contain references to images on your own hub."
 
-#: ../../Zotlabs/Module/Setup.php:662
+#: ../../Zotlabs/Module/Setup.php:639
 msgid ""
 "If your certificate is not recognized, members of other sites (who may "
 "themselves have valid certificates) will get a warning message on their own "
 "site complaining about security issues."
 msgstr "If your certificate is not recognized, members of other hubs (who may themselves have valid certificates) will get a warning message on their own hub complaining about security issues."
 
-#: ../../Zotlabs/Module/Setup.php:663
+#: ../../Zotlabs/Module/Setup.php:640
 msgid ""
 "This can cause usability issues elsewhere (not just on your own site) so we "
 "must insist on this requirement."
 msgstr "This can cause usability issues elsewhere (not just on your own hub) so we must insist on this requirement."
 
-#: ../../Zotlabs/Module/Setup.php:664
+#: ../../Zotlabs/Module/Setup.php:641
 msgid ""
 "Providers are available that issue free certificates which are browser-"
 "valid."
 msgstr "Providers are available that issue free certificates which are browser-valid."
 
-#: ../../Zotlabs/Module/Setup.php:666
+#: ../../Zotlabs/Module/Setup.php:643
 msgid "SSL certificate validation"
 msgstr "SSL certificate validation"
 
-#: ../../Zotlabs/Module/Setup.php:672
+#: ../../Zotlabs/Module/Setup.php:649
 msgid ""
 "Url rewrite in .htaccess is not working. Check your server "
 "configuration.Test: "
 msgstr "Url rewrite in .htaccess is not working. Check your server configuration.Test: "
 
-#: ../../Zotlabs/Module/Setup.php:675
+#: ../../Zotlabs/Module/Setup.php:652
 msgid "Url rewrite is working"
 msgstr "Url rewrite is working"
 
-#: ../../Zotlabs/Module/Setup.php:684
+#: ../../Zotlabs/Module/Setup.php:661
 msgid ""
 "The database configuration file \".htconfig.php\" could not be written. "
 "Please use the enclosed text to create a configuration file in your web "
 "server root."
 msgstr "The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."
 
-#: ../../Zotlabs/Module/Setup.php:708
+#: ../../Zotlabs/Module/Setup.php:685
 msgid "Errors encountered creating database tables."
 msgstr "Errors encountered creating database tables."
 
-#: ../../Zotlabs/Module/Setup.php:742
+#: ../../Zotlabs/Module/Setup.php:719
 msgid "<h1>What next</h1>"
 msgstr "<h1>What next</h1>"
 
-#: ../../Zotlabs/Module/Setup.php:743
+#: ../../Zotlabs/Module/Setup.php:720
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the "
 "poller."
@@ -6098,12 +6082,12 @@ msgstr "Geen voorgestelde kanalen gevonden. Wanneer dit een nieuwe hub is, probe
 msgid "Ignore/Hide"
 msgstr "Negeren/Verbergen"
 
-#: ../../Zotlabs/Module/Tagger.php:55 ../../include/bbcode.php:257
+#: ../../Zotlabs/Module/Tagger.php:55 ../../include/bbcode.php:256
 msgid "post"
 msgstr "bericht"
 
 #: ../../Zotlabs/Module/Tagger.php:57 ../../include/conversation.php:150
-#: ../../include/text.php:1960
+#: ../../include/text.php:1933
 msgid "comment"
 msgstr "reactie"
 
@@ -6239,16 +6223,16 @@ msgid ""
 " please import or restore these in date order (oldest first)."
 msgstr "Deze back-up-bestanden kunnen geïmporteerd of hersteld worden door op jouw hub en met jouw kanaal <a href=\"%1$s\">%2$s</a> te bezoeken. Voor het beste resultaat kan je de bestanden in chronologische volgorde importeren of herstellen."
 
-#: ../../Zotlabs/Module/Viewconnections.php:63
+#: ../../Zotlabs/Module/Viewconnections.php:62
 msgid "No connections."
 msgstr "Geen connecties."
 
-#: ../../Zotlabs/Module/Viewconnections.php:76
+#: ../../Zotlabs/Module/Viewconnections.php:75
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr "Bezoek het profiel van %s [%s]"
 
-#: ../../Zotlabs/Module/Viewconnections.php:105
+#: ../../Zotlabs/Module/Viewconnections.php:104
 msgid "View Connections"
 msgstr "Connecties weergeven"
 
@@ -6256,8 +6240,8 @@ msgstr "Connecties weergeven"
 msgid "Source of Item"
 msgstr "Bron van item"
 
-#: ../../Zotlabs/Module/Webpages.php:184 ../../include/nav.php:106
-#: ../../include/conversation.php:1692 ../../include/apps.php:168
+#: ../../Zotlabs/Module/Webpages.php:184 ../../Zotlabs/Lib/Apps.php:217
+#: ../../include/conversation.php:1685 ../../include/nav.php:106
 msgid "Webpages"
 msgstr "Webpagina's"
 
@@ -6281,866 +6265,1518 @@ msgstr "Xchan opzoeken"
 msgid "Lookup xchan beginning with (or webbie): "
 msgstr "Zoek een xchan (of webbie) die begint met:"
 
-#: ../../include/Import/import_diaspora.php:17
-msgid "No username found in import file."
-msgstr "Geen gebruikersnaam in het importbestand gevonden."
+#: ../../Zotlabs/Lib/Apps.php:204
+msgid "Site Admin"
+msgstr "Hubbeheerder"
 
-#: ../../include/Import/import_diaspora.php:42 ../../include/import.php:48
-msgid "Unable to create a unique channel address. Import failed."
-msgstr "Niet in staat om een uniek kanaaladres aan te maken. Importeren is mislukt."
+#: ../../Zotlabs/Lib/Apps.php:205
+msgid "Bug Report"
+msgstr "Bugrapport"
+
+#: ../../Zotlabs/Lib/Apps.php:206
+msgid "View Bookmarks"
+msgstr "Bladwijzers bekijken"
+
+#: ../../Zotlabs/Lib/Apps.php:207
+msgid "My Chatrooms"
+msgstr "Mijn chatkanalen"
+
+#: ../../Zotlabs/Lib/Apps.php:209
+msgid "Firefox Share"
+msgstr "Firefox Share"
+
+#: ../../Zotlabs/Lib/Apps.php:210
+msgid "Remote Diagnostics"
+msgstr "Diagnose op afstand"
+
+#: ../../Zotlabs/Lib/Apps.php:211 ../../include/features.php:89
+msgid "Suggest Channels"
+msgstr "Kanalen voorstellen"
+
+#: ../../Zotlabs/Lib/Apps.php:212 ../../include/nav.php:110
+#: ../../boot.php:1695
+msgid "Login"
+msgstr "Inloggen"
+
+#: ../../Zotlabs/Lib/Apps.php:214 ../../include/nav.php:179
+msgid "Grid"
+msgstr "Grid"
+
+#: ../../Zotlabs/Lib/Apps.php:218 ../../include/nav.php:182
+msgid "Channel Home"
+msgstr "Jouw kanaal"
+
+#: ../../Zotlabs/Lib/Apps.php:221 ../../include/conversation.php:1649
+#: ../../include/conversation.php:1652 ../../include/nav.php:201
+msgid "Events"
+msgstr "Agenda"
+
+#: ../../Zotlabs/Lib/Apps.php:222 ../../include/nav.php:167
+msgid "Directory"
+msgstr "Kanalengids"
+
+#: ../../Zotlabs/Lib/Apps.php:224 ../../include/nav.php:193
+msgid "Mail"
+msgstr "Privéberichten"
+
+#: ../../Zotlabs/Lib/Apps.php:227 ../../include/nav.php:96
+msgid "Chat"
+msgstr "Chatten"
+
+#: ../../Zotlabs/Lib/Apps.php:229
+msgid "Probe"
+msgstr "Onderzoeken"
+
+#: ../../Zotlabs/Lib/Apps.php:230
+msgid "Suggest"
+msgstr "Voorstellen"
+
+#: ../../Zotlabs/Lib/Apps.php:231
+msgid "Random Channel"
+msgstr "Willekeurig kanaal"
+
+#: ../../Zotlabs/Lib/Apps.php:232
+msgid "Invite"
+msgstr "Uitnodigen "
+
+#: ../../Zotlabs/Lib/Apps.php:233 ../../include/widgets.php:1384
+msgid "Features"
+msgstr "Extra functies"
+
+#: ../../Zotlabs/Lib/Apps.php:235
+msgid "Post"
+msgstr "Bericht"
+
+#: ../../Zotlabs/Lib/Apps.php:335
+msgid "Purchase"
+msgstr "Aanschaffen"
+
+#: ../../Zotlabs/Lib/Chatroom.php:27
+msgid "Missing room name"
+msgstr "Naam chatkanaal ontbreekt"
+
+#: ../../Zotlabs/Lib/Chatroom.php:36
+msgid "Duplicate room name"
+msgstr "Naam chatkanaal bestaat al"
+
+#: ../../Zotlabs/Lib/Chatroom.php:86 ../../Zotlabs/Lib/Chatroom.php:94
+msgid "Invalid room specifier."
+msgstr "Ongeldige omschrijving chatkanaal"
+
+#: ../../Zotlabs/Lib/Chatroom.php:126
+msgid "Room not found."
+msgstr "Chatkanaal niet gevonden"
+
+#: ../../Zotlabs/Lib/Chatroom.php:147
+msgid "Room is full"
+msgstr "Chatkanaal is vol"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:85 ../../include/conversation.php:664
+msgid "Private Message"
+msgstr "Niet voor iedereen zichtbaar"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:122 ../../include/conversation.php:656
+msgid "Select"
+msgstr "Kies"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:126
+msgid "Save to Folder"
+msgstr "In map opslaan"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:147
+msgid "I will attend"
+msgstr "Aanwezig"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:147
+msgid "I will not attend"
+msgstr "Niet aanwezig"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:147
+msgid "I might attend"
+msgstr "Mogelijk aanwezig"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:157
+msgid "I agree"
+msgstr "Eens"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:157
+msgid "I disagree"
+msgstr "Oneens"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:157
+msgid "I abstain"
+msgstr "Onthouding"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:208
+msgid "Add Star"
+msgstr "Ster toevoegen"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:209
+msgid "Remove Star"
+msgstr "Ster verwijderen"
 
-#: ../../include/dba/dba_driver.php:159
+#: ../../Zotlabs/Lib/ThreadItem.php:210
+msgid "Toggle Star Status"
+msgstr "Ster toevoegen of verwijderen"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:214
+msgid "starred"
+msgstr "met ster"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:224 ../../include/conversation.php:671
+msgid "Message signature validated"
+msgstr "Berichtkenmerk gevalideerd"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:225 ../../include/conversation.php:672
+msgid "Message signature incorrect"
+msgstr "Berichtkenmerk onjuist"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:233
+msgid "Add Tag"
+msgstr "Tag toevoegen"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:251 ../../include/taxonomy.php:316
+msgid "like"
+msgstr "vind dit leuk"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:252 ../../include/taxonomy.php:317
+msgid "dislike"
+msgstr "vind dit niet leuk"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:256
+msgid "Share This"
+msgstr "Delen"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:256
+msgid "share"
+msgstr "delen"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:265
+msgid "Delivery Report"
+msgstr "Afleveringsrapport"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:283
 #, php-format
-msgid "Cannot locate DNS info for database server '%s'"
-msgstr "Kan DNS-informatie voor databaseserver '%s' niet vinden"
+msgid "%d comment"
+msgid_plural "%d comments"
+msgstr[0] "%d reactie"
+msgstr[1] "%d reacties weergeven"
 
-#: ../../include/api.php:1338
-msgid "Public Timeline"
-msgstr "Openbare tijdlijn"
+#: ../../Zotlabs/Lib/ThreadItem.php:312 ../../Zotlabs/Lib/ThreadItem.php:313
+#, php-format
+msgid "View %s's profile - %s"
+msgstr "Profiel van %s bekijken - %s"
 
-#: ../../include/notify.php:20
-msgid "created a new post"
-msgstr "maakte een nieuw bericht aan"
+#: ../../Zotlabs/Lib/ThreadItem.php:316
+msgid "to"
+msgstr "aan"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:317
+msgid "via"
+msgstr "via"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:318
+msgid "Wall-to-Wall"
+msgstr "Kanaal-naar-kanaal"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:319
+msgid "via Wall-To-Wall:"
+msgstr "via kanaal-naar-kanaal"
 
-#: ../../include/notify.php:21
+#: ../../Zotlabs/Lib/ThreadItem.php:331 ../../include/conversation.php:719
 #, php-format
-msgid "commented on %s's post"
-msgstr "gaf een reactie op een bericht van %s"
+msgid "from %s"
+msgstr "van %s"
 
-#: ../../include/oembed.php:324
-msgid "Embedded content"
-msgstr "Ingesloten (embedded) inhoud"
+#: ../../Zotlabs/Lib/ThreadItem.php:334 ../../include/conversation.php:722
+#, php-format
+msgid "last edited: %s"
+msgstr "laatst bewerkt: %s"
 
-#: ../../include/oembed.php:333
-msgid "Embedding disabled"
-msgstr "Insluiten (embedding) uitgeschakeld"
+#: ../../Zotlabs/Lib/ThreadItem.php:335 ../../include/conversation.php:723
+#, php-format
+msgid "Expires: %s"
+msgstr "Verloopt: %s"
 
-#: ../../include/profile_selectors.php:6
-msgid "Currently Male"
-msgstr "Momenteel man"
+#: ../../Zotlabs/Lib/ThreadItem.php:359
+msgid "Save Bookmarks"
+msgstr "Bladwijzers opslaan"
 
-#: ../../include/profile_selectors.php:6
-msgid "Currently Female"
-msgstr "Momenteel vrouw"
+#: ../../Zotlabs/Lib/ThreadItem.php:360
+msgid "Add to Calendar"
+msgstr "Aan agenda toevoegen"
 
-#: ../../include/profile_selectors.php:6
-msgid "Mostly Male"
-msgstr "Voornamelijk man"
+#: ../../Zotlabs/Lib/ThreadItem.php:369
+msgid "Mark all seen"
+msgstr "Markeer alles als bekeken"
 
-#: ../../include/profile_selectors.php:6
-msgid "Mostly Female"
-msgstr "Voornamelijk vrouw"
+#: ../../Zotlabs/Lib/ThreadItem.php:410 ../../include/js_strings.php:7
+msgid "[+] show all"
+msgstr "[+] alle"
 
-#: ../../include/profile_selectors.php:6
-msgid "Transgender"
-msgstr "Transgender"
+#: ../../Zotlabs/Lib/ThreadItem.php:700 ../../include/conversation.php:1215
+msgid "Bold"
+msgstr "Vet"
 
-#: ../../include/profile_selectors.php:6
-msgid "Intersex"
-msgstr "Interseksueel"
+#: ../../Zotlabs/Lib/ThreadItem.php:701 ../../include/conversation.php:1216
+msgid "Italic"
+msgstr "Cursief"
 
-#: ../../include/profile_selectors.php:6
-msgid "Transsexual"
-msgstr "Transseksueel"
+#: ../../Zotlabs/Lib/ThreadItem.php:702 ../../include/conversation.php:1217
+msgid "Underline"
+msgstr "Onderstrepen"
 
-#: ../../include/profile_selectors.php:6
-msgid "Hermaphrodite"
-msgstr "Hermafrodiet"
+#: ../../Zotlabs/Lib/ThreadItem.php:703 ../../include/conversation.php:1218
+msgid "Quote"
+msgstr "Citeren"
 
-#: ../../include/profile_selectors.php:6
-msgid "Neuter"
-msgstr "Genderneutraal"
+#: ../../Zotlabs/Lib/ThreadItem.php:704 ../../include/conversation.php:1219
+msgid "Code"
+msgstr "Broncode"
 
-#: ../../include/profile_selectors.php:6
-msgid "Non-specific"
-msgstr "Niet gespecificeerd"
+#: ../../Zotlabs/Lib/ThreadItem.php:705
+msgid "Image"
+msgstr "Afbeelding"
 
-#: ../../include/profile_selectors.php:6
-#: ../../include/profile_selectors.php:23
-#: ../../include/profile_selectors.php:61
-#: ../../include/profile_selectors.php:97 ../../include/permissions.php:881
-msgid "Other"
-msgstr "Anders"
+#: ../../Zotlabs/Lib/ThreadItem.php:706
+msgid "Insert Link"
+msgstr "Link invoegen"
 
-#: ../../include/profile_selectors.php:6
-msgid "Undecided"
-msgstr "Nog niet beslist"
+#: ../../Zotlabs/Lib/ThreadItem.php:707
+msgid "Video"
+msgstr "Video"
 
-#: ../../include/profile_selectors.php:42
-#: ../../include/profile_selectors.php:61
-msgid "Males"
-msgstr "Mannen"
+#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1823
+msgid "$Projectname Notification"
+msgstr "$Projectname-notificatie"
 
-#: ../../include/profile_selectors.php:42
-#: ../../include/profile_selectors.php:61
-msgid "Females"
-msgstr "Vrouwen"
+#: ../../Zotlabs/Lib/Enotify.php:61 ../../include/network.php:1824
+msgid "$projectname"
+msgstr "$projectname"
 
-#: ../../include/profile_selectors.php:42
-msgid "Gay"
-msgstr "Homoseksueel"
+#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1826
+msgid "Thank You,"
+msgstr "Bedankt,"
 
-#: ../../include/profile_selectors.php:42
-msgid "Lesbian"
-msgstr "Lesbisch"
+#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1828
+#, php-format
+msgid "%s Administrator"
+msgstr "Beheerder %s"
 
-#: ../../include/profile_selectors.php:42
-msgid "No Preference"
-msgstr "Geen voorkeur"
+#: ../../Zotlabs/Lib/Enotify.php:100
+#, php-format
+msgid "%s <!item_type!>"
+msgstr "%s <!item_type!>"
 
-#: ../../include/profile_selectors.php:42
-msgid "Bisexual"
-msgstr "Biseksueel"
+#: ../../Zotlabs/Lib/Enotify.php:104
+#, php-format
+msgid "[Hubzilla:Notify] New mail received at %s"
+msgstr "[Hubzilla:Notificatie] Nieuw privébericht ontvangen op %s"
 
-#: ../../include/profile_selectors.php:42
-msgid "Autosexual"
-msgstr "Autoseksueel"
+#: ../../Zotlabs/Lib/Enotify.php:106
+#, php-format
+msgid "%1$s, %2$s sent you a new private message at %3$s."
+msgstr "%1$s, %2$s zond jou een nieuw privébericht om %3$s."
 
-#: ../../include/profile_selectors.php:42
-msgid "Abstinent"
-msgstr "Seksuele onthouding"
+#: ../../Zotlabs/Lib/Enotify.php:107
+#, php-format
+msgid "%1$s sent you %2$s."
+msgstr "%1$s zond jou %2$s."
 
-#: ../../include/profile_selectors.php:42
-msgid "Virgin"
-msgstr "Maagd"
+#: ../../Zotlabs/Lib/Enotify.php:107
+msgid "a private message"
+msgstr "een privébericht"
 
-#: ../../include/profile_selectors.php:42
-msgid "Deviant"
-msgstr "Afwijkend"
+#: ../../Zotlabs/Lib/Enotify.php:108
+#, php-format
+msgid "Please visit %s to view and/or reply to your private messages."
+msgstr "Bezoek %s om je privéberichten te bekijken en/of er op te reageren."
 
-#: ../../include/profile_selectors.php:42
-msgid "Fetish"
-msgstr "Fetisj"
+#: ../../Zotlabs/Lib/Enotify.php:164
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
+msgstr "%1$s, %2$s gaf een reactie op [zrl=%3$s]een %4$s[/zrl]"
 
-#: ../../include/profile_selectors.php:42
-msgid "Oodles"
-msgstr "Veel"
+#: ../../Zotlabs/Lib/Enotify.php:172
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
+msgstr "%1$s, %2$s gaf een reactie op [zrl=%3$s]een %5$s van %4$s[/zrl]"
 
-#: ../../include/profile_selectors.php:42
-msgid "Nonsexual"
-msgstr "Aseksueel"
+#: ../../Zotlabs/Lib/Enotify.php:181
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
+msgstr "%1$s, %2$s gaf een reactie op [zrl=%3$s]jouw %4$s[/zrl]"
 
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Single"
-msgstr "Alleen"
+#: ../../Zotlabs/Lib/Enotify.php:192
+#, php-format
+msgid "[Hubzilla:Notify] Comment to conversation #%1$d by %2$s"
+msgstr "[Hubzilla:Notificatie] Reactie op conversatie #%1$d door %2$s"
 
-#: ../../include/profile_selectors.php:80
-msgid "Lonely"
-msgstr "Eenzaam"
+#: ../../Zotlabs/Lib/Enotify.php:193
+#, php-format
+msgid "%1$s, %2$s commented on an item/conversation you have been following."
+msgstr "%1$s, %2$s gaf een reactie op een bericht/conversatie die jij volgt."
 
-#: ../../include/profile_selectors.php:80
-msgid "Available"
-msgstr "Beschikbaar"
+#: ../../Zotlabs/Lib/Enotify.php:196 ../../Zotlabs/Lib/Enotify.php:211
+#: ../../Zotlabs/Lib/Enotify.php:237 ../../Zotlabs/Lib/Enotify.php:255
+#: ../../Zotlabs/Lib/Enotify.php:269
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
+msgstr "Bezoek %s om de conversatie te bekijken en/of er op te reageren."
 
-#: ../../include/profile_selectors.php:80
-msgid "Unavailable"
-msgstr "Niet beschikbaar"
+#: ../../Zotlabs/Lib/Enotify.php:202
+#, php-format
+msgid "[Hubzilla:Notify] %s posted to your profile wall"
+msgstr "[Hubzilla:Notificatie] %s heeft een bericht op jouw kanaal geplaatst"
 
-#: ../../include/profile_selectors.php:80
-msgid "Has crush"
-msgstr "Heeft een oogje op iemand"
+#: ../../Zotlabs/Lib/Enotify.php:204
+#, php-format
+msgid "%1$s, %2$s posted to your profile wall at %3$s"
+msgstr "%1$s, %2$s heeft om %3$s een bericht op jouw kanaal geplaatst"
 
-#: ../../include/profile_selectors.php:80
-msgid "Infatuated"
-msgstr "Smoorverliefd"
+#: ../../Zotlabs/Lib/Enotify.php:206
+#, php-format
+msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
+msgstr "%1$s, %2$s heeft een bericht op [zrl=%3$s]jouw kanaal[/zrl] geplaatst"
 
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Dating"
-msgstr "Aan het daten"
+#: ../../Zotlabs/Lib/Enotify.php:230
+#, php-format
+msgid "[Hubzilla:Notify] %s tagged you"
+msgstr "[Hubzilla:Notificatie] %s heeft je genoemd"
 
-#: ../../include/profile_selectors.php:80
-msgid "Unfaithful"
-msgstr "Ontrouw"
+#: ../../Zotlabs/Lib/Enotify.php:231
+#, php-format
+msgid "%1$s, %2$s tagged you at %3$s"
+msgstr "%1$s, %2$s noemde jou op %3$s"
 
-#: ../../include/profile_selectors.php:80
-msgid "Sex Addict"
-msgstr "Seksverslaafd"
+#: ../../Zotlabs/Lib/Enotify.php:232
+#, php-format
+msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
+msgstr "%1$s, %2$s [zrl=%3$s]noemde jou[/zrl]."
 
-#: ../../include/profile_selectors.php:80
-msgid "Friends/Benefits"
-msgstr "Vriendschap plus"
+#: ../../Zotlabs/Lib/Enotify.php:244
+#, php-format
+msgid "[Hubzilla:Notify] %1$s poked you"
+msgstr "[Hubzilla:Notificatie] %1$s heeft je aangestoten"
 
-#: ../../include/profile_selectors.php:80
-msgid "Casual"
-msgstr "Ongebonden/vluchtig"
+#: ../../Zotlabs/Lib/Enotify.php:245
+#, php-format
+msgid "%1$s, %2$s poked you at %3$s"
+msgstr "%1$s, %2$s heeft je aangestoten op %3$s"
 
-#: ../../include/profile_selectors.php:80
-msgid "Engaged"
-msgstr "Verloofd"
+#: ../../Zotlabs/Lib/Enotify.php:246
+#, php-format
+msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
+msgstr "%1$s, %2$s [zrl=%2$s]heeft je aangestoten[/zrl]."
 
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Married"
-msgstr "Getrouwd"
+#: ../../Zotlabs/Lib/Enotify.php:262
+#, php-format
+msgid "[Hubzilla:Notify] %s tagged your post"
+msgstr "[Hubzilla:Notificatie] %s heeft jouw bericht getagd"
 
-#: ../../include/profile_selectors.php:80
-msgid "Imaginarily married"
-msgstr "Denkbeeldig getrouwd"
+#: ../../Zotlabs/Lib/Enotify.php:263
+#, php-format
+msgid "%1$s, %2$s tagged your post at %3$s"
+msgstr "%1$s, %2$s heeft jouw bericht om %3$s getagd"
 
-#: ../../include/profile_selectors.php:80
-msgid "Partners"
-msgstr "Partners"
+#: ../../Zotlabs/Lib/Enotify.php:264
+#, php-format
+msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
+msgstr "%1$s, %2$s heeft [zrl=%3$s]jouw bericht[/zrl] getagd"
 
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Cohabiting"
-msgstr "Samenwonend"
+#: ../../Zotlabs/Lib/Enotify.php:276
+msgid "[Hubzilla:Notify] Introduction received"
+msgstr "[Hubzilla:Notificatie] Connectieverzoek ontvangen"
 
-#: ../../include/profile_selectors.php:80
-msgid "Common law"
-msgstr "Common-law-huwelijk"
+#: ../../Zotlabs/Lib/Enotify.php:277
+#, php-format
+msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
+msgstr "%1$s, je hebt een nieuw connectieverzoek ontvangen van '%2$s' op %3$s"
 
-#: ../../include/profile_selectors.php:80
-msgid "Happy"
-msgstr "Gelukkig"
+#: ../../Zotlabs/Lib/Enotify.php:278
+#, php-format
+msgid ""
+"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
+msgstr "%1$s, je hebt een [zrl=%2$s]nieuw connectieverzoek[/zrl] ontvangen van %3$s."
 
-#: ../../include/profile_selectors.php:80
-msgid "Not looking"
-msgstr "Niet op zoek"
+#: ../../Zotlabs/Lib/Enotify.php:282 ../../Zotlabs/Lib/Enotify.php:301
+#, php-format
+msgid "You may visit their profile at %s"
+msgstr "Je kan het profiel bekijken op %s"
 
-#: ../../include/profile_selectors.php:80
-msgid "Swinger"
-msgstr "Swinger"
+#: ../../Zotlabs/Lib/Enotify.php:284
+#, php-format
+msgid "Please visit %s to approve or reject the connection request."
+msgstr "Bezoek %s om het connectieverzoek te accepteren of af te wijzen."
 
-#: ../../include/profile_selectors.php:80
-msgid "Betrayed"
-msgstr "Verraden"
+#: ../../Zotlabs/Lib/Enotify.php:291
+msgid "[Hubzilla:Notify] Friend suggestion received"
+msgstr "[Hubzilla:Notificatie] Kanaalvoorstel ontvangen"
 
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Separated"
-msgstr "Uit elkaar"
+#: ../../Zotlabs/Lib/Enotify.php:292
+#, php-format
+msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
+msgstr "%1$s, je hebt een kanaalvoorstel ontvangen van '%2$s' om %3$s"
 
-#: ../../include/profile_selectors.php:80
-msgid "Unstable"
-msgstr "Onstabiel"
+#: ../../Zotlabs/Lib/Enotify.php:293
+#, php-format
+msgid ""
+"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from "
+"%4$s."
+msgstr "%1$s, je hebt [zrl=%2$s]een kanaalvoorstel[/zrl] ontvangen voor %3$s van %4$s."
 
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Divorced"
-msgstr "Gescheiden"
+#: ../../Zotlabs/Lib/Enotify.php:299
+msgid "Name:"
+msgstr "Naam:"
 
-#: ../../include/profile_selectors.php:80
-msgid "Imaginarily divorced"
-msgstr "Denkbeeldig gescheiden"
+#: ../../Zotlabs/Lib/Enotify.php:300
+msgid "Photo:"
+msgstr "Foto:"
 
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Widowed"
-msgstr "Weduwnaar/weduwe"
+#: ../../Zotlabs/Lib/Enotify.php:303
+#, php-format
+msgid "Please visit %s to approve or reject the suggestion."
+msgstr "Bezoek %s om het voorstel te accepteren of af te wijzen."
 
-#: ../../include/profile_selectors.php:80
-msgid "Uncertain"
-msgstr "Onzeker"
+#: ../../Zotlabs/Lib/Enotify.php:518
+msgid "[Hubzilla:Notify]"
+msgstr "[Hubzilla:Notificatie]"
 
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "It's complicated"
-msgstr "Het is ingewikkeld"
+#: ../../Zotlabs/Lib/Enotify.php:667
+msgid "created a new post"
+msgstr "maakte een nieuw bericht aan"
 
-#: ../../include/profile_selectors.php:80
-msgid "Don't care"
-msgstr "Maakt mij niks uit"
+#: ../../Zotlabs/Lib/Enotify.php:668
+#, php-format
+msgid "commented on %s's post"
+msgstr "gaf een reactie op een bericht van %s"
 
-#: ../../include/profile_selectors.php:80
-msgid "Ask me"
-msgstr "Vraag het me"
+#: ../../include/Import/import_diaspora.php:16
+msgid "No username found in import file."
+msgstr "Geen gebruikersnaam in het importbestand gevonden."
+
+#: ../../include/Import/import_diaspora.php:41 ../../include/import.php:50
+msgid "Unable to create a unique channel address. Import failed."
+msgstr "Niet in staat om een uniek kanaaladres aan te maken. Importeren is mislukt."
+
+#: ../../include/dba/dba_driver.php:171
+#, php-format
+msgid "Cannot locate DNS info for database server '%s'"
+msgstr "Kan DNS-informatie voor databaseserver '%s' niet vinden"
+
+#: ../../include/network.php:657
+msgid "view full size"
+msgstr "volledige grootte tonen"
+
+#: ../../include/network.php:1871 ../../include/account.php:317
+#: ../../include/account.php:344 ../../include/account.php:404
+msgid "Administrator"
+msgstr "Beheerder"
+
+#: ../../include/network.php:1885
+msgid "No Subject"
+msgstr "Geen onderwerp"
+
+#: ../../include/network.php:2146 ../../include/network.php:2147
+msgid "Friendica"
+msgstr "Friendica"
+
+#: ../../include/network.php:2148
+msgid "OStatus"
+msgstr "OStatus"
+
+#: ../../include/network.php:2149
+msgid "GNU-Social"
+msgstr "GNU social"
+
+#: ../../include/network.php:2150
+msgid "RSS/Atom"
+msgstr "RSS/Atom"
+
+#: ../../include/network.php:2152
+msgid "Diaspora"
+msgstr "Diaspora"
+
+#: ../../include/network.php:2153
+msgid "Facebook"
+msgstr "Facebook"
+
+#: ../../include/network.php:2154
+msgid "Zot"
+msgstr "Zot"
+
+#: ../../include/network.php:2155
+msgid "LinkedIn"
+msgstr "LinkedIn"
+
+#: ../../include/network.php:2156
+msgid "XMPP/IM"
+msgstr "XMPP/IM"
+
+#: ../../include/network.php:2157
+msgid "MySpace"
+msgstr "MySpace"
+
+#: ../../include/photos.php:110
+#, php-format
+msgid "Image exceeds website size limit of %lu bytes"
+msgstr "Afbeelding is groter dan op deze hub toegestane limiet van %lu bytes"
+
+#: ../../include/photos.php:117
+msgid "Image file is empty."
+msgstr "Afbeeldingsbestand is leeg"
+
+#: ../../include/photos.php:255
+msgid "Photo storage failed."
+msgstr "Foto kan niet worden opgeslagen"
 
-#: ../../include/Contact.php:118
+#: ../../include/photos.php:295
+msgid "a new photo"
+msgstr "een nieuwe foto"
+
+#: ../../include/photos.php:299
+#, php-format
+msgctxt "photo_upload"
+msgid "%1$s posted %2$s to %3$s"
+msgstr "%1$s plaatste %2$s op %3$s"
+
+#: ../../include/photos.php:504 ../../include/conversation.php:1635
+msgid "Photo Albums"
+msgstr "Fotoalbums"
+
+#: ../../include/photos.php:508
+msgid "Upload New Photos"
+msgstr "Nieuwe foto's uploaden"
+
+#: ../../include/connections.php:95
 msgid "New window"
 msgstr "Nieuw venster"
 
-#: ../../include/Contact.php:119
+#: ../../include/connections.php:96
 msgid "Open the selected location in a different window or browser tab"
 msgstr "Open de geselecteerde locatie in een ander venster of tab"
 
-#: ../../include/Contact.php:237
+#: ../../include/connections.php:214
 #, php-format
 msgid "User '%s' deleted"
 msgstr "Account '%s' verwijderd"
 
-#: ../../include/zot.php:680
-msgid "Invalid data packet"
-msgstr "Datapakket ongeldig"
-
-#: ../../include/zot.php:696
-msgid "Unable to verify channel signature"
-msgstr "Kanaalkenmerk kon niet worden geverifieerd.  "
-
-#: ../../include/zot.php:2342
-#, php-format
-msgid "Unable to verify site signature for %s"
-msgstr "Hubkenmerk voor %s kon niet worden geverifieerd"
+#: ../../include/oembed.php:324
+msgid "Embedded content"
+msgstr "Ingesloten (embedded) inhoud"
 
-#: ../../include/zot.php:3680
-msgid "invalid target signature"
-msgstr "ongeldig doelkenmerk"
+#: ../../include/oembed.php:333
+msgid "Embedding disabled"
+msgstr "Insluiten (embedding) uitgeschakeld"
 
-#: ../../include/contact_widgets.php:14
+#: ../../include/contact_widgets.php:11
 #, php-format
 msgid "%d invitation available"
 msgid_plural "%d invitations available"
 msgstr[0] "%d uitnodiging beschikbaar"
 msgstr[1] "%d uitnodigingen beschikbaar"
 
-#: ../../include/contact_widgets.php:22
+#: ../../include/contact_widgets.php:19
 msgid "Find Channels"
 msgstr "Kanalen vinden"
 
-#: ../../include/contact_widgets.php:23
+#: ../../include/contact_widgets.php:20
 msgid "Enter name or interest"
 msgstr "Vul naam of interesse in"
 
-#: ../../include/contact_widgets.php:24
+#: ../../include/contact_widgets.php:21
 msgid "Connect/Follow"
 msgstr "Verbinden/volgen"
 
-#: ../../include/contact_widgets.php:25
+#: ../../include/contact_widgets.php:22
 msgid "Examples: Robert Morgenstein, Fishing"
 msgstr "Voorbeeld: Robert Morgenstein, vissen"
 
-#: ../../include/contact_widgets.php:29
+#: ../../include/contact_widgets.php:26
 msgid "Random Profile"
 msgstr "Willekeurig profiel"
 
-#: ../../include/contact_widgets.php:30
+#: ../../include/contact_widgets.php:27
 msgid "Invite Friends"
 msgstr "Vrienden uitnodigen"
 
-#: ../../include/contact_widgets.php:32
+#: ../../include/contact_widgets.php:29
 msgid "Advanced example: name=fred and country=iceland"
 msgstr "Geavanceerd voorbeeld (Engels): name=jan en country=nederland"
 
-#: ../../include/contact_widgets.php:57 ../../include/widgets.php:310
+#: ../../include/contact_widgets.php:53 ../../include/widgets.php:310
 #: ../../include/features.php:97
 msgid "Saved Folders"
 msgstr "Bewaarde mappen"
 
-#: ../../include/contact_widgets.php:60 ../../include/contact_widgets.php:100
+#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94
 #: ../../include/widgets.php:313 ../../include/widgets.php:432
 msgid "Everything"
 msgstr "Alles"
 
-#: ../../include/contact_widgets.php:97 ../../include/widgets.php:46
+#: ../../include/contact_widgets.php:91 ../../include/widgets.php:46
 #: ../../include/widgets.php:429 ../../include/taxonomy.php:188
 #: ../../include/taxonomy.php:270
 msgid "Categories"
 msgstr "Categorieën"
 
-#: ../../include/contact_widgets.php:130
+#: ../../include/contact_widgets.php:122
 #, php-format
 msgid "%d connection in common"
 msgid_plural "%d connections in common"
 msgstr[0] "%d gemeenschappelijke connectie"
 msgstr[1] "%d gemeenschappelijke connecties"
 
-#: ../../include/contact_widgets.php:135
+#: ../../include/contact_widgets.php:127
 msgid "show more"
 msgstr "meer connecties weergeven"
 
-#: ../../include/event.php:22 ../../include/text.php:1466
-#: ../../include/bb2diaspora.php:487
+#: ../../include/conversation.php:204
+#, php-format
+msgid "%1$s is now connected with %2$s"
+msgstr "%1$s is nu met %2$s verbonden"
+
+#: ../../include/conversation.php:239
+#, php-format
+msgid "%1$s poked %2$s"
+msgstr "%1$s heeft %2$s aangestoten"
+
+#: ../../include/conversation.php:243 ../../include/text.php:1033
+#: ../../include/text.php:1038
+msgid "poked"
+msgstr "aangestoten"
+
+#: ../../include/conversation.php:691
+#, php-format
+msgid "View %s's profile @ %s"
+msgstr "Bekijk het profiel van %s @ %s"
+
+#: ../../include/conversation.php:710
+msgid "Categories:"
+msgstr "Categorieën:"
+
+#: ../../include/conversation.php:711
+msgid "Filed under:"
+msgstr "Bewaard onder:"
+
+#: ../../include/conversation.php:738
+msgid "View in context"
+msgstr "In context bekijken"
+
+#: ../../include/conversation.php:847
+msgid "remove"
+msgstr "verwijderen"
+
+#: ../../include/conversation.php:851 ../../include/nav.php:247
+msgid "Loading..."
+msgstr "Aan het laden..."
+
+#: ../../include/conversation.php:852
+msgid "Delete Selected Items"
+msgstr "Verwijder de geselecteerde items"
+
+#: ../../include/conversation.php:948
+msgid "View Source"
+msgstr "Bron weergeven"
+
+#: ../../include/conversation.php:949
+msgid "Follow Thread"
+msgstr "Conversatie volgen"
+
+#: ../../include/conversation.php:950
+msgid "Unfollow Thread"
+msgstr "Conversatie niet meer volgen"
+
+#: ../../include/conversation.php:955
+msgid "Activity/Posts"
+msgstr "Activiteit/berichten connectie"
+
+#: ../../include/conversation.php:957
+msgid "Edit Connection"
+msgstr "Connectie bewerken"
+
+#: ../../include/conversation.php:958
+msgid "Message"
+msgstr "Bericht"
+
+#: ../../include/conversation.php:1075
+#, php-format
+msgid "%s likes this."
+msgstr "%s vindt dit leuk."
+
+#: ../../include/conversation.php:1075
+#, php-format
+msgid "%s doesn't like this."
+msgstr "%s vindt dit niet leuk."
+
+#: ../../include/conversation.php:1079
+#, 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] "<span  %1$s>%2$d persoon</span> vindt dit leuk."
+msgstr[1] "<span  %1$s>%2$d personen</span> vinden dit leuk."
+
+#: ../../include/conversation.php:1081
+#, 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] "<span  %1$s>%2$d persoon</span> vindt dit niet leuk."
+msgstr[1] "<span  %1$s>%2$d personen</span> vinden dit niet leuk."
+
+#: ../../include/conversation.php:1087
+msgid "and"
+msgstr "en"
+
+#: ../../include/conversation.php:1090
+#, php-format
+msgid ", and %d other people"
+msgid_plural ", and %d other people"
+msgstr[0] ", en %d ander persoon"
+msgstr[1] ", en %d andere personen"
+
+#: ../../include/conversation.php:1091
+#, php-format
+msgid "%s like this."
+msgstr "%s vinden dit leuk."
+
+#: ../../include/conversation.php:1091
+#, php-format
+msgid "%s don't like this."
+msgstr "%s vinden dit niet leuk."
+
+#: ../../include/conversation.php:1130
+msgid "Set your location"
+msgstr "Locatie instellen"
+
+#: ../../include/conversation.php:1131
+msgid "Clear browser location"
+msgstr "Locatie van webbrowser wissen"
+
+#: ../../include/conversation.php:1177
+msgid "Tag term:"
+msgstr "Tag:"
+
+#: ../../include/conversation.php:1178
+msgid "Where are you right now?"
+msgstr "Waar bevind je je op dit moment?"
+
+#: ../../include/conversation.php:1210
+msgid "Page link name"
+msgstr "Linknaam pagina"
+
+#: ../../include/conversation.php:1213
+msgid "Post as"
+msgstr "Bericht plaatsen als"
+
+#: ../../include/conversation.php:1223
+msgid "Toggle voting"
+msgstr "Peiling in- of uitschakelen"
+
+#: ../../include/conversation.php:1231
+msgid "Categories (optional, comma-separated list)"
+msgstr "Categorieën (optioneel, door komma's gescheiden lijst)"
+
+#: ../../include/conversation.php:1254
+msgid "Set publish date"
+msgstr "Publicatiedatum instellen"
+
+#: ../../include/conversation.php:1258
+msgid "OK"
+msgstr "OK"
+
+#: ../../include/conversation.php:1503
+msgid "Discover"
+msgstr "Ontdekken"
+
+#: ../../include/conversation.php:1506
+msgid "Imported public streams"
+msgstr "Openbare streams importeren"
+
+#: ../../include/conversation.php:1511
+msgid "Commented Order"
+msgstr "Nieuwe reacties bovenaan"
+
+#: ../../include/conversation.php:1514
+msgid "Sort by Comment Date"
+msgstr "Berichten met nieuwe reacties bovenaan"
+
+#: ../../include/conversation.php:1518
+msgid "Posted Order"
+msgstr "Nieuwe berichten bovenaan"
+
+#: ../../include/conversation.php:1521
+msgid "Sort by Post Date"
+msgstr "Nieuwe berichten bovenaan"
+
+#: ../../include/conversation.php:1529
+msgid "Posts that mention or involve you"
+msgstr "Alleen berichten die jou vermelden of waar je op een andere manier bij betrokken bent"
+
+#: ../../include/conversation.php:1538
+msgid "Activity Stream - by date"
+msgstr "Activiteitenstroom - volgens datum"
+
+#: ../../include/conversation.php:1544
+msgid "Starred"
+msgstr "Met ster"
+
+#: ../../include/conversation.php:1547
+msgid "Favourite Posts"
+msgstr "Favoriete berichten"
+
+#: ../../include/conversation.php:1554
+msgid "Spam"
+msgstr "Spam"
+
+#: ../../include/conversation.php:1557
+msgid "Posts flagged as SPAM"
+msgstr "Berichten gemarkeerd als SPAM"
+
+#: ../../include/conversation.php:1614
+msgid "Status Messages and Posts"
+msgstr "Berichten in dit kanaal"
+
+#: ../../include/conversation.php:1623
+msgid "About"
+msgstr "Over"
+
+#: ../../include/conversation.php:1626
+msgid "Profile Details"
+msgstr "Profiel"
+
+#: ../../include/conversation.php:1642
+msgid "Files and Storage"
+msgstr "Bestanden en opslagruimte"
+
+#: ../../include/conversation.php:1662 ../../include/conversation.php:1665
+#: ../../include/widgets.php:840
+msgid "Chatrooms"
+msgstr "Chatkanalen"
+
+#: ../../include/conversation.php:1675 ../../include/nav.php:102
+msgid "Bookmarks"
+msgstr "Bladwijzers"
+
+#: ../../include/conversation.php:1678
+msgid "Saved Bookmarks"
+msgstr "Opgeslagen bladwijzers"
+
+#: ../../include/conversation.php:1688
+msgid "Manage Webpages"
+msgstr "Webpagina's beheren"
+
+#: ../../include/conversation.php:1747
+msgctxt "noun"
+msgid "Attending"
+msgid_plural "Attending"
+msgstr[0] "aanwezig"
+msgstr[1] "aanwezig"
+
+#: ../../include/conversation.php:1750
+msgctxt "noun"
+msgid "Not Attending"
+msgid_plural "Not Attending"
+msgstr[0] "niet aanwezig"
+msgstr[1] "niet aanwezig"
+
+#: ../../include/conversation.php:1753
+msgctxt "noun"
+msgid "Undecided"
+msgid_plural "Undecided"
+msgstr[0] "nog niet beslist"
+msgstr[1] "nog niet beslist"
+
+#: ../../include/conversation.php:1756
+msgctxt "noun"
+msgid "Agree"
+msgid_plural "Agrees"
+msgstr[0] "eens"
+msgstr[1] "eens"
+
+#: ../../include/conversation.php:1759
+msgctxt "noun"
+msgid "Disagree"
+msgid_plural "Disagrees"
+msgstr[0] "oneens"
+msgstr[1] "oneens"
+
+#: ../../include/conversation.php:1762
+msgctxt "noun"
+msgid "Abstain"
+msgid_plural "Abstains"
+msgstr[0] "onthouding"
+msgstr[1] "onthoudingen"
+
+#: ../../include/event.php:22 ../../include/event.php:69
+#: ../../include/bb2diaspora.php:485
 msgid "l F d, Y \\@ g:i A"
 msgstr "l d F Y \\@ G:i"
 
-#: ../../include/event.php:30 ../../include/text.php:1470
-#: ../../include/bb2diaspora.php:493
+#: ../../include/event.php:30 ../../include/event.php:73
+#: ../../include/bb2diaspora.php:491
 msgid "Starts:"
 msgstr "Start:"
 
-#: ../../include/event.php:40 ../../include/text.php:1474
-#: ../../include/bb2diaspora.php:501
+#: ../../include/event.php:40 ../../include/event.php:77
+#: ../../include/bb2diaspora.php:499
 msgid "Finishes:"
 msgstr "Einde:"
 
-#: ../../include/event.php:769
+#: ../../include/event.php:812
 msgid "This event has been added to your calendar."
 msgstr "Dit evenement is aan jouw agenda toegevoegd."
 
-#: ../../include/event.php:968
+#: ../../include/event.php:1012
 msgid "Not specified"
 msgstr "Niet aangegeven"
 
-#: ../../include/event.php:969
+#: ../../include/event.php:1013
 msgid "Needs Action"
 msgstr "Actie vereist"
 
-#: ../../include/event.php:970
+#: ../../include/event.php:1014
 msgid "Completed"
 msgstr "Voltooid"
 
-#: ../../include/event.php:971
+#: ../../include/event.php:1015
 msgid "In Process"
 msgstr "In behandeling"
 
-#: ../../include/event.php:972
+#: ../../include/event.php:1016
 msgid "Cancelled"
 msgstr "Geannuleerd"
 
-#: ../../include/widgets.php:103
-msgid "System"
-msgstr "Systeem"
+#: ../../include/message.php:20
+msgid "No recipient provided."
+msgstr "Geen ontvanger opgegeven."
 
-#: ../../include/widgets.php:106
-msgid "New App"
-msgstr "Nieuwe app"
+#: ../../include/message.php:25
+msgid "[no subject]"
+msgstr "[geen onderwerp]"
 
-#: ../../include/widgets.php:154
-msgid "Suggestions"
-msgstr "Voorgestelde kanalen"
+#: ../../include/message.php:45
+msgid "Unable to determine sender."
+msgstr "Afzender kan niet bepaald worden."
 
-#: ../../include/widgets.php:155
-msgid "See more..."
-msgstr "Meer..."
+#: ../../include/message.php:222
+msgid "Stored post could not be verified."
+msgstr "Opgeslagen bericht kon niet worden geverifieerd."
 
-#: ../../include/widgets.php:175
-#, php-format
-msgid "You have %1$.0f of %2$.0f allowed connections."
-msgstr "Je hebt %1$.0f van de %2$.0f toegestane connecties."
+#: ../../include/selectors.php:30
+msgid "Frequently"
+msgstr "Regelmatig"
 
-#: ../../include/widgets.php:181
-msgid "Add New Connection"
-msgstr "Nieuwe connectie toevoegen"
+#: ../../include/selectors.php:31
+msgid "Hourly"
+msgstr "Elk uur"
 
-#: ../../include/widgets.php:182
-msgid "Enter channel address"
-msgstr "Vul kanaaladres in"
+#: ../../include/selectors.php:32
+msgid "Twice daily"
+msgstr "Twee keer per dag"
 
-#: ../../include/widgets.php:183
-msgid "Examples: bob@example.com, https://example.com/barbara"
-msgstr "Voorbeelden: bob@example.com, http://example.com/barbara"
+#: ../../include/selectors.php:33
+msgid "Daily"
+msgstr "Dagelijks"
 
-#: ../../include/widgets.php:199
-msgid "Notes"
-msgstr "Aantekeningen"
+#: ../../include/selectors.php:34
+msgid "Weekly"
+msgstr "Wekelijks"
 
-#: ../../include/widgets.php:273
-msgid "Remove term"
-msgstr "Verwijder zoekterm"
+#: ../../include/selectors.php:35
+msgid "Monthly"
+msgstr "Maandelijks"
 
-#: ../../include/widgets.php:281 ../../include/features.php:84
-msgid "Saved Searches"
-msgstr "Opgeslagen zoekopdrachten"
+#: ../../include/selectors.php:49
+msgid "Currently Male"
+msgstr "Momenteel man"
 
-#: ../../include/widgets.php:282 ../../include/group.php:316
-msgid "add"
-msgstr "toevoegen"
+#: ../../include/selectors.php:49
+msgid "Currently Female"
+msgstr "Momenteel vrouw"
 
-#: ../../include/widgets.php:354
-msgid "Archives"
-msgstr "Archieven"
+#: ../../include/selectors.php:49
+msgid "Mostly Male"
+msgstr "Voornamelijk man"
 
-#: ../../include/widgets.php:516
-msgid "Refresh"
-msgstr "Vernieuwen"
+#: ../../include/selectors.php:49
+msgid "Mostly Female"
+msgstr "Voornamelijk vrouw"
 
-#: ../../include/widgets.php:556
-msgid "Account settings"
-msgstr "Account"
+#: ../../include/selectors.php:49
+msgid "Transgender"
+msgstr "Transgender"
 
-#: ../../include/widgets.php:562
-msgid "Channel settings"
-msgstr "Kanaal"
+#: ../../include/selectors.php:49
+msgid "Intersex"
+msgstr "Interseksueel"
 
-#: ../../include/widgets.php:571
-msgid "Additional features"
-msgstr "Extra functies"
+#: ../../include/selectors.php:49
+msgid "Transsexual"
+msgstr "Transseksueel"
 
-#: ../../include/widgets.php:578
-msgid "Feature/Addon settings"
-msgstr "Plugin-instellingen"
+#: ../../include/selectors.php:49
+msgid "Hermaphrodite"
+msgstr "Hermafrodiet"
 
-#: ../../include/widgets.php:584
-msgid "Display settings"
-msgstr "Weergave"
+#: ../../include/selectors.php:49
+msgid "Neuter"
+msgstr "Genderneutraal"
 
-#: ../../include/widgets.php:591
-msgid "Manage locations"
-msgstr "Locaties beheren"
+#: ../../include/selectors.php:49
+msgid "Non-specific"
+msgstr "Niet gespecificeerd"
 
-#: ../../include/widgets.php:600
-msgid "Export channel"
-msgstr "Kanaal exporteren"
+#: ../../include/selectors.php:49 ../../include/selectors.php:66
+#: ../../include/selectors.php:104 ../../include/selectors.php:140
+#: ../../include/permissions.php:881
+msgid "Other"
+msgstr "Anders"
 
-#: ../../include/widgets.php:607
-msgid "Connected apps"
-msgstr "Verbonden applicaties"
+#: ../../include/selectors.php:49
+msgid "Undecided"
+msgstr "Nog niet beslist"
 
-#: ../../include/widgets.php:622
-msgid "Premium Channel Settings"
-msgstr "Instellingen premiumkanaal"
+#: ../../include/selectors.php:85 ../../include/selectors.php:104
+msgid "Males"
+msgstr "Mannen"
 
-#: ../../include/widgets.php:651
-msgid "Private Mail Menu"
-msgstr "Privéberichten"
+#: ../../include/selectors.php:85 ../../include/selectors.php:104
+msgid "Females"
+msgstr "Vrouwen"
 
-#: ../../include/widgets.php:653
-msgid "Combined View"
-msgstr "Gecombineerd postvak"
+#: ../../include/selectors.php:85
+msgid "Gay"
+msgstr "Homoseksueel"
 
-#: ../../include/widgets.php:658 ../../include/nav.php:196
-msgid "Inbox"
-msgstr "Postvak IN"
+#: ../../include/selectors.php:85
+msgid "Lesbian"
+msgstr "Lesbisch"
 
-#: ../../include/widgets.php:663 ../../include/nav.php:197
-msgid "Outbox"
-msgstr "Postvak UIT"
+#: ../../include/selectors.php:85
+msgid "No Preference"
+msgstr "Geen voorkeur"
 
-#: ../../include/widgets.php:668 ../../include/nav.php:198
-msgid "New Message"
-msgstr "Nieuw bericht"
+#: ../../include/selectors.php:85
+msgid "Bisexual"
+msgstr "Biseksueel"
 
-#: ../../include/widgets.php:685 ../../include/widgets.php:697
-msgid "Conversations"
-msgstr "Conversaties"
+#: ../../include/selectors.php:85
+msgid "Autosexual"
+msgstr "Autoseksueel"
 
-#: ../../include/widgets.php:689
-msgid "Received Messages"
-msgstr "Ontvangen berichten"
+#: ../../include/selectors.php:85
+msgid "Abstinent"
+msgstr "Seksuele onthouding"
 
-#: ../../include/widgets.php:693
-msgid "Sent Messages"
-msgstr "Verzonden berichten"
+#: ../../include/selectors.php:85
+msgid "Virgin"
+msgstr "Maagd"
 
-#: ../../include/widgets.php:707
-msgid "No messages."
-msgstr "Geen berichten"
+#: ../../include/selectors.php:85
+msgid "Deviant"
+msgstr "Afwijkend"
 
-#: ../../include/widgets.php:725
-msgid "Delete conversation"
-msgstr "Verwijder conversatie"
+#: ../../include/selectors.php:85
+msgid "Fetish"
+msgstr "Fetisj"
 
-#: ../../include/widgets.php:751
-msgid "Events Menu"
-msgstr "Agenda-menu"
+#: ../../include/selectors.php:85
+msgid "Oodles"
+msgstr "Veel"
 
-#: ../../include/widgets.php:752
-msgid "Day View"
-msgstr "Dag tonen"
+#: ../../include/selectors.php:85
+msgid "Nonsexual"
+msgstr "Aseksueel"
 
-#: ../../include/widgets.php:753
-msgid "Week View"
-msgstr "Week tonen"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Single"
+msgstr "Alleen"
 
-#: ../../include/widgets.php:754
-msgid "Month View"
-msgstr "Maand tonen"
+#: ../../include/selectors.php:123
+msgid "Lonely"
+msgstr "Eenzaam"
 
-#: ../../include/widgets.php:766
-msgid "Events Tools"
-msgstr "Agenda-hulpmiddelen"
+#: ../../include/selectors.php:123
+msgid "Available"
+msgstr "Beschikbaar"
 
-#: ../../include/widgets.php:767
-msgid "Export Calendar"
-msgstr "Exporteren"
+#: ../../include/selectors.php:123
+msgid "Unavailable"
+msgstr "Niet beschikbaar"
 
-#: ../../include/widgets.php:768
-msgid "Import Calendar"
-msgstr "Importeren"
+#: ../../include/selectors.php:123
+msgid "Has crush"
+msgstr "Heeft een oogje op iemand"
 
-#: ../../include/widgets.php:843 ../../include/conversation.php:1669
-#: ../../include/conversation.php:1672
-msgid "Chatrooms"
-msgstr "Chatkanalen"
+#: ../../include/selectors.php:123
+msgid "Infatuated"
+msgstr "Smoorverliefd"
 
-#: ../../include/widgets.php:847
-msgid "Overview"
-msgstr "Overzicht"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Dating"
+msgstr "Aan het daten"
 
-#: ../../include/widgets.php:854
-msgid "Chat Members"
-msgstr "Chatleden"
+#: ../../include/selectors.php:123
+msgid "Unfaithful"
+msgstr "Ontrouw"
 
-#: ../../include/widgets.php:877
-msgid "Bookmarked Chatrooms"
-msgstr "Bladwijzers van chatkanalen"
+#: ../../include/selectors.php:123
+msgid "Sex Addict"
+msgstr "Seksverslaafd"
 
-#: ../../include/widgets.php:900
-msgid "Suggested Chatrooms"
-msgstr "Voorgestelde chatkanalen"
+#: ../../include/selectors.php:123
+msgid "Friends/Benefits"
+msgstr "Vriendschap plus"
 
-#: ../../include/widgets.php:1045 ../../include/widgets.php:1157
-msgid "photo/image"
-msgstr "foto/afbeelding"
+#: ../../include/selectors.php:123
+msgid "Casual"
+msgstr "Ongebonden/vluchtig"
 
-#: ../../include/widgets.php:1100
-msgid "Click to show more"
-msgstr "Klik voor meer"
+#: ../../include/selectors.php:123
+msgid "Engaged"
+msgstr "Verloofd"
 
-#: ../../include/widgets.php:1251
-msgid "Rating Tools"
-msgstr "Beoordelingen"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Married"
+msgstr "Getrouwd"
 
-#: ../../include/widgets.php:1255 ../../include/widgets.php:1257
-msgid "Rate Me"
-msgstr "Beoordeel mij"
+#: ../../include/selectors.php:123
+msgid "Imaginarily married"
+msgstr "Denkbeeldig getrouwd"
 
-#: ../../include/widgets.php:1260
-msgid "View Ratings"
-msgstr "Bekijk beoordelingen"
+#: ../../include/selectors.php:123
+msgid "Partners"
+msgstr "Partners"
 
-#: ../../include/widgets.php:1317
-msgid "Forums"
-msgstr "Forums"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Cohabiting"
+msgstr "Samenwonend"
 
-#: ../../include/widgets.php:1346
-msgid "Tasks"
-msgstr "Taken"
+#: ../../include/selectors.php:123
+msgid "Common law"
+msgstr "Common-law-huwelijk"
 
-#: ../../include/widgets.php:1355
-msgid "Documentation"
-msgstr "Documentatie"
+#: ../../include/selectors.php:123
+msgid "Happy"
+msgstr "Gelukkig"
 
-#: ../../include/widgets.php:1357
-msgid "Project/Site Information"
-msgstr "Project- en hub-informatie"
+#: ../../include/selectors.php:123
+msgid "Not looking"
+msgstr "Niet op zoek"
 
-#: ../../include/widgets.php:1358
-msgid "For Members"
-msgstr "Voor leden"
+#: ../../include/selectors.php:123
+msgid "Swinger"
+msgstr "Swinger"
 
-#: ../../include/widgets.php:1359
-msgid "For Administrators"
-msgstr "Voor beheerders"
+#: ../../include/selectors.php:123
+msgid "Betrayed"
+msgstr "Verraden"
 
-#: ../../include/widgets.php:1360
-msgid "For Developers"
-msgstr "Voor ontwikkelaars"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Separated"
+msgstr "Uit elkaar"
 
-#: ../../include/widgets.php:1384
-msgid "Accounts"
-msgstr "Accounts"
+#: ../../include/selectors.php:123
+msgid "Unstable"
+msgstr "Onstabiel"
 
-#: ../../include/widgets.php:1384 ../../include/widgets.php:1422
-msgid "Member registrations waiting for confirmation"
-msgstr "Accounts die op goedkeuring wachten"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Divorced"
+msgstr "Gescheiden"
 
-#: ../../include/widgets.php:1387 ../../include/apps.php:184
-msgid "Features"
-msgstr "Extra functies"
+#: ../../include/selectors.php:123
+msgid "Imaginarily divorced"
+msgstr "Denkbeeldig gescheiden"
 
-#: ../../include/widgets.php:1390
-msgid "Inspect queue"
-msgstr "Inspecteer berichtenwachtrij"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Widowed"
+msgstr "Weduwnaar/weduwe"
 
-#: ../../include/widgets.php:1392
-msgid "DB updates"
-msgstr "Database-updates"
+#: ../../include/selectors.php:123
+msgid "Uncertain"
+msgstr "Onzeker"
 
-#: ../../include/widgets.php:1417 ../../include/nav.php:216
-msgid "Admin"
-msgstr "Beheer"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "It's complicated"
+msgstr "Het is ingewikkeld"
 
-#: ../../include/widgets.php:1418
-msgid "Plugin Features"
-msgstr "Plugin-opties"
+#: ../../include/selectors.php:123
+msgid "Don't care"
+msgstr "Maakt mij niks uit"
+
+#: ../../include/selectors.php:123
+msgid "Ask me"
+msgstr "Vraag het me"
+
+#: ../../include/bbcode.php:123 ../../include/bbcode.php:844
+#: ../../include/bbcode.php:847 ../../include/bbcode.php:852
+#: ../../include/bbcode.php:855 ../../include/bbcode.php:858
+#: ../../include/bbcode.php:861 ../../include/bbcode.php:866
+#: ../../include/bbcode.php:869 ../../include/bbcode.php:874
+#: ../../include/bbcode.php:877 ../../include/bbcode.php:880
+#: ../../include/bbcode.php:883
+msgid "Image/photo"
+msgstr "Afbeelding/foto"
+
+#: ../../include/bbcode.php:162 ../../include/bbcode.php:894
+msgid "Encrypted content"
+msgstr "Versleutelde inhoud"
+
+#: ../../include/bbcode.php:178
+#, php-format
+msgid "Install %s element: "
+msgstr "Installeer %s-element: "
+
+#: ../../include/bbcode.php:182
+#, php-format
+msgid ""
+"This post contains an installable %s element, however you lack permissions "
+"to install it on this site."
+msgstr "Dit bericht heeft een te installeren %s-element, maar je hebt geen permissies om het op deze hub te installeren."
+
+#: ../../include/bbcode.php:254
+#, php-format
+msgid "%1$s wrote the following %2$s %3$s"
+msgstr "%1$s schreef het volgende %2$s %3$s"
+
+#: ../../include/bbcode.php:331 ../../include/bbcode.php:339
+msgid "Click to open/close"
+msgstr "Klik om te openen of te sluiten"
+
+#: ../../include/bbcode.php:339
+msgid "spoiler"
+msgstr "spoiler"
+
+#: ../../include/bbcode.php:585
+msgid "Different viewers will see this text differently"
+msgstr "Deze tekst wordt per persoon anders weergeven."
+
+#: ../../include/bbcode.php:832
+msgid "$1 wrote:"
+msgstr "$1 schreef:"
 
 #: ../../include/bookmarks.php:35
 #, php-format
 msgid "%1$s's bookmarks"
 msgstr "Bladwijzers van %1$s"
 
-#: ../../include/chat.php:23
-msgid "Missing room name"
-msgstr "Naam chatkanaal ontbreekt"
+#: ../../include/attach.php:247 ../../include/attach.php:333
+msgid "Item was not found."
+msgstr "Item niet gevonden"
 
-#: ../../include/chat.php:32
-msgid "Duplicate room name"
-msgstr "Naam chatkanaal bestaat al"
+#: ../../include/attach.php:497
+msgid "No source file."
+msgstr "Geen bronbestand."
 
-#: ../../include/chat.php:82 ../../include/chat.php:90
-msgid "Invalid room specifier."
-msgstr "Ongeldige omschrijving chatkanaal"
+#: ../../include/attach.php:519
+msgid "Cannot locate file to replace"
+msgstr "Kan het te vervangen bestand niet vinden"
 
-#: ../../include/chat.php:122
-msgid "Room not found."
-msgstr "Chatkanaal niet gevonden"
+#: ../../include/attach.php:537
+msgid "Cannot locate file to revise/update"
+msgstr "Kan het bestand wat aangepast moet worden niet vinden"
 
-#: ../../include/chat.php:143
-msgid "Room is full"
-msgstr "Chatkanaal is vol"
+#: ../../include/attach.php:672
+#, php-format
+msgid "File exceeds size limit of %d"
+msgstr "Bestand is groter dan de toegelaten %d"
 
-#: ../../include/identity.php:32
+#: ../../include/attach.php:686
+#, php-format
+msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
+msgstr "Je hebt jouw limiet van %1$.0f MB opslagruimte voor bijlagen bereikt."
+
+#: ../../include/attach.php:842
+msgid "File upload failed. Possible system limit or action terminated."
+msgstr "Uploaden van bestand mislukt. Mogelijk systeemlimiet bereikt of actie afgebroken."
+
+#: ../../include/attach.php:855
+msgid "Stored file could not be verified. Upload failed."
+msgstr "Opgeslagen bestand kon niet worden geverifieerd. Uploaden mislukt."
+
+#: ../../include/attach.php:909 ../../include/attach.php:925
+msgid "Path not available."
+msgstr "Pad niet beschikbaar."
+
+#: ../../include/attach.php:971 ../../include/attach.php:1123
+msgid "Empty pathname"
+msgstr "Padnaam leeg"
+
+#: ../../include/attach.php:997
+msgid "duplicate filename or path"
+msgstr "dubbele bestandsnaam of pad"
+
+#: ../../include/attach.php:1019
+msgid "Path not found."
+msgstr "Pad niet gevonden"
+
+#: ../../include/attach.php:1077
+msgid "mkdir failed."
+msgstr "directory aanmaken (mkdir) mislukt."
+
+#: ../../include/attach.php:1081
+msgid "database storage failed."
+msgstr "opslag in database mislukt."
+
+#: ../../include/attach.php:1129
+msgid "Empty path"
+msgstr "Ontbrekend bestandspad"
+
+#: ../../include/channel.php:32
 msgid "Unable to obtain identity information from database"
 msgstr "Niet in staat om identiteitsinformatie uit de database te verkrijgen"
 
-#: ../../include/identity.php:66
+#: ../../include/channel.php:66
 msgid "Empty name"
 msgstr "Ontbrekende naam"
 
-#: ../../include/identity.php:69
+#: ../../include/channel.php:69
 msgid "Name too long"
 msgstr "Naam te lang"
 
-#: ../../include/identity.php:180
+#: ../../include/channel.php:180
 msgid "No account identifier"
 msgstr "Geen account-identificator"
 
-#: ../../include/identity.php:192
+#: ../../include/channel.php:192
 msgid "Nickname is required."
 msgstr "Bijnaam is verplicht"
 
-#: ../../include/identity.php:206
+#: ../../include/channel.php:206
 msgid "Reserved nickname. Please choose another."
 msgstr "Deze naam is gereserveerd. Kies een andere."
 
-#: ../../include/identity.php:211
+#: ../../include/channel.php:211
 msgid ""
 "Nickname has unsupported characters or is already being used on this site."
 msgstr "Deze naam heeft niet ondersteunde karakters of is al op deze hub in gebruik."
 
-#: ../../include/identity.php:287
+#: ../../include/channel.php:287
 msgid "Unable to retrieve created identity"
 msgstr "Niet in staat om aangemaakte identiteit te vinden"
 
-#: ../../include/identity.php:345
+#: ../../include/channel.php:345
 msgid "Default Profile"
 msgstr "Standaardprofiel"
 
-#: ../../include/identity.php:791
+#: ../../include/channel.php:791
 msgid "Requested channel is not available."
 msgstr "Opgevraagd kanaal is niet beschikbaar."
 
-#: ../../include/identity.php:938
+#: ../../include/channel.php:938
 msgid "Create New Profile"
 msgstr "Nieuw profiel aanmaken"
 
-#: ../../include/identity.php:941 ../../include/nav.php:90
+#: ../../include/channel.php:941 ../../include/nav.php:90
 msgid "Edit Profile"
 msgstr "Profiel bewerken"
 
-#: ../../include/identity.php:958
+#: ../../include/channel.php:958
 msgid "Visible to everybody"
 msgstr "Voor iedereen zichtbaar"
 
-#: ../../include/identity.php:1033 ../../include/identity.php:1288
+#: ../../include/channel.php:1031 ../../include/channel.php:1142
 msgid "Gender:"
 msgstr "Geslacht:"
 
-#: ../../include/identity.php:1034 ../../include/identity.php:1332
+#: ../../include/channel.php:1032 ../../include/channel.php:1186
 msgid "Status:"
 msgstr "Status:"
 
-#: ../../include/identity.php:1035 ../../include/identity.php:1343
+#: ../../include/channel.php:1033 ../../include/channel.php:1197
 msgid "Homepage:"
 msgstr "Homepagina:"
 
-#: ../../include/identity.php:1036
+#: ../../include/channel.php:1034
 msgid "Online Now"
 msgstr "Nu online"
 
-#: ../../include/identity.php:1124 ../../include/identity.php:1200
-msgid "F d"
-msgstr "d F"
-
-#: ../../include/identity.php:1180
-msgid "Birthday Reminders"
-msgstr "Verjaardagsherinneringen"
-
-#: ../../include/identity.php:1181
-msgid "Birthdays this week:"
-msgstr "Verjaardagen deze week:"
-
-#: ../../include/identity.php:1232
-msgid "[No description]"
-msgstr "[Geen omschrijving]"
-
-#: ../../include/identity.php:1250
-msgid "Event Reminders"
-msgstr "Herinneringen"
-
-#: ../../include/identity.php:1251
-msgid "Events this week:"
-msgstr "Gebeurtenissen deze week:"
-
-#: ../../include/identity.php:1293
+#: ../../include/channel.php:1147
 msgid "Like this channel"
 msgstr "Vind dit kanaal leuk"
 
-#: ../../include/identity.php:1317
+#: ../../include/channel.php:1171
 msgid "j F, Y"
 msgstr "F j Y"
 
-#: ../../include/identity.php:1318
+#: ../../include/channel.php:1172
 msgid "j F"
 msgstr "F j"
 
-#: ../../include/identity.php:1325
+#: ../../include/channel.php:1179
 msgid "Birthday:"
 msgstr "Geboortedatum:"
 
-#: ../../include/identity.php:1338
+#: ../../include/channel.php:1192
 #, php-format
 msgid "for %1$d %2$s"
 msgstr "voor %1$d %2$s"
 
-#: ../../include/identity.php:1341
+#: ../../include/channel.php:1195
 msgid "Sexual Preference:"
 msgstr "Seksuele voorkeur:"
 
-#: ../../include/identity.php:1347
+#: ../../include/channel.php:1201
 msgid "Tags:"
 msgstr "Tags:"
 
-#: ../../include/identity.php:1349
+#: ../../include/channel.php:1203
 msgid "Political Views:"
 msgstr "Politieke overtuigingen:"
 
-#: ../../include/identity.php:1351
+#: ../../include/channel.php:1205
 msgid "Religion:"
 msgstr "Religie:"
 
-#: ../../include/identity.php:1355
+#: ../../include/channel.php:1209
 msgid "Hobbies/Interests:"
 msgstr "Hobby's/interesses:"
 
-#: ../../include/identity.php:1357
+#: ../../include/channel.php:1211
 msgid "Likes:"
 msgstr "Houdt van:"
 
-#: ../../include/identity.php:1359
+#: ../../include/channel.php:1213
 msgid "Dislikes:"
 msgstr "Houdt niet van:"
 
-#: ../../include/identity.php:1361
+#: ../../include/channel.php:1215
 msgid "Contact information and Social Networks:"
 msgstr "Contactinformatie en sociale netwerken:"
 
-#: ../../include/identity.php:1363
+#: ../../include/channel.php:1217
 msgid "My other channels:"
 msgstr "Mijn andere kanalen"
 
-#: ../../include/identity.php:1365
+#: ../../include/channel.php:1219
 msgid "Musical interests:"
 msgstr "Muzikale interesses:"
 
-#: ../../include/identity.php:1367
+#: ../../include/channel.php:1221
 msgid "Books, literature:"
 msgstr "Boeken, literatuur:"
 
-#: ../../include/identity.php:1369
+#: ../../include/channel.php:1223
 msgid "Television:"
 msgstr "Televisie:"
 
-#: ../../include/identity.php:1371
+#: ../../include/channel.php:1225
 msgid "Film/dance/culture/entertainment:"
 msgstr "Films/dansen/cultuur/vermaak:"
 
-#: ../../include/identity.php:1373
+#: ../../include/channel.php:1227
 msgid "Love/Romance:"
 msgstr "Liefde/romantiek:"
 
-#: ../../include/identity.php:1375
+#: ../../include/channel.php:1229
 msgid "Work/employment:"
 msgstr "Werk/beroep:"
 
-#: ../../include/identity.php:1377
+#: ../../include/channel.php:1231
 msgid "School/education:"
 msgstr "School/opleiding:"
 
-#: ../../include/identity.php:1397
+#: ../../include/channel.php:1251
 msgid "Like this thing"
 msgstr "Vind dit ding leuk"
 
@@ -7150,38 +7786,7 @@ msgid ""
 "form has been opened for too long (>3 hours) before submitting it."
 msgstr "De beveiligings-token van het tekstvak was ongeldig. Dit is mogelijk het gevolg van dat er te lang (meer dan 3 uur) gewacht is om de tekst op te slaan. "
 
-#: ../../include/photos.php:112
-#, php-format
-msgid "Image exceeds website size limit of %lu bytes"
-msgstr "Afbeelding is groter dan op deze hub toegestane limiet van %lu bytes"
-
-#: ../../include/photos.php:119
-msgid "Image file is empty."
-msgstr "Afbeeldingsbestand is leeg"
-
-#: ../../include/photos.php:257
-msgid "Photo storage failed."
-msgstr "Foto kan niet worden opgeslagen"
-
-#: ../../include/photos.php:297
-msgid "a new photo"
-msgstr "een nieuwe foto"
-
-#: ../../include/photos.php:301
-#, php-format
-msgctxt "photo_upload"
-msgid "%1$s posted %2$s to %3$s"
-msgstr "%1$s plaatste %2$s op %3$s"
-
-#: ../../include/photos.php:506 ../../include/conversation.php:1641
-msgid "Photo Albums"
-msgstr "Fotoalbums"
-
-#: ../../include/photos.php:510
-msgid "Upload New Photos"
-msgstr "Nieuwe foto's uploaden"
-
-#: ../../include/nav.php:82 ../../include/nav.php:113 ../../boot.php:1628
+#: ../../include/nav.php:82 ../../include/nav.php:113 ../../boot.php:1694
 msgid "Logout"
 msgstr "Uitloggen"
 
@@ -7217,18 +7822,10 @@ msgstr "Jouw foto's"
 msgid "Your files"
 msgstr "Jouw bestanden"
 
-#: ../../include/nav.php:96 ../../include/apps.php:178
-msgid "Chat"
-msgstr "Chatten"
-
 #: ../../include/nav.php:96
 msgid "Your chatrooms"
 msgstr "Jouw chatkanalen"
 
-#: ../../include/nav.php:102 ../../include/conversation.php:1682
-msgid "Bookmarks"
-msgstr "Bladwijzers"
-
 #: ../../include/nav.php:102
 msgid "Your bookmarks"
 msgstr "Jouw bladwijzers"
@@ -7237,10 +7834,6 @@ msgstr "Jouw bladwijzers"
 msgid "Your webpages"
 msgstr "Jouw webpagina's"
 
-#: ../../include/nav.php:110 ../../include/apps.php:163 ../../boot.php:1629
-msgid "Login"
-msgstr "Inloggen"
-
 #: ../../include/nav.php:110
 msgid "Sign in"
 msgstr "Inloggen"
@@ -7278,18 +7871,10 @@ msgstr "Apps"
 msgid "Search site @name, #tag, ?docs, content"
 msgstr "Zoek een @kanaal, doorzoek inhoud hub met tekst en #tags, of doorzoek ?documentatie "
 
-#: ../../include/nav.php:167 ../../include/apps.php:173
-msgid "Directory"
-msgstr "Kanalengids"
-
 #: ../../include/nav.php:167
 msgid "Channel Directory"
 msgstr "Kanalengids"
 
-#: ../../include/nav.php:179 ../../include/apps.php:165
-msgid "Grid"
-msgstr "Grid"
-
 #: ../../include/nav.php:179
 msgid "Your grid"
 msgstr "Jouw grid"
@@ -7298,10 +7883,6 @@ msgstr "Jouw grid"
 msgid "Mark all grid notifications seen"
 msgstr "Markeer alle gridnotificaties als bekeken"
 
-#: ../../include/nav.php:182 ../../include/apps.php:169
-msgid "Channel Home"
-msgstr "Jouw kanaal"
-
 #: ../../include/nav.php:182
 msgid "Channel home"
 msgstr "Jouw kanaal"
@@ -7322,10 +7903,6 @@ msgstr "Notificaties"
 msgid "See all notifications"
 msgstr "Alle notificaties weergeven"
 
-#: ../../include/nav.php:193 ../../include/apps.php:175
-msgid "Mail"
-msgstr "Privéberichten"
-
 #: ../../include/nav.php:193
 msgid "Private mail"
 msgstr "Privéberichten"
@@ -7338,10 +7915,17 @@ msgstr "Alle privéberichten weergeven"
 msgid "Mark all private messages seen"
 msgstr "Markeer alle privéberichten als bekeken"
 
-#: ../../include/nav.php:201 ../../include/conversation.php:1655
-#: ../../include/conversation.php:1658 ../../include/apps.php:172
-msgid "Events"
-msgstr "Agenda"
+#: ../../include/nav.php:196 ../../include/widgets.php:658
+msgid "Inbox"
+msgstr "Postvak IN"
+
+#: ../../include/nav.php:197 ../../include/widgets.php:663
+msgid "Outbox"
+msgstr "Postvak UIT"
+
+#: ../../include/nav.php:198 ../../include/widgets.php:668
+msgid "New Message"
+msgstr "Nieuw bericht"
 
 #: ../../include/nav.php:201
 msgid "Event Calendar"
@@ -7363,14 +7947,14 @@ msgstr "Beheer je kanalen"
 msgid "Account/Channel Settings"
 msgstr "Account-/kanaal-instellingen"
 
+#: ../../include/nav.php:216 ../../include/widgets.php:1414
+msgid "Admin"
+msgstr "Beheer"
+
 #: ../../include/nav.php:216
 msgid "Site Setup and Configuration"
 msgstr "Hub instellen en beheren"
 
-#: ../../include/nav.php:247 ../../include/conversation.php:854
-msgid "Loading..."
-msgstr "Aan het laden..."
-
 #: ../../include/nav.php:252
 msgid "@name, #tag, ?doc, content"
 msgstr "@kanaal, #tag, inhoud, ?hulp"
@@ -7379,663 +7963,541 @@ msgstr "@kanaal, #tag, inhoud, ?hulp"
 msgid "Please wait..."
 msgstr "Wachten aub..."
 
-#: ../../include/contact_selectors.php:56
-msgid "Frequently"
-msgstr "Regelmatig"
+#: ../../include/widgets.php:103
+msgid "System"
+msgstr "Systeem"
 
-#: ../../include/contact_selectors.php:57
-msgid "Hourly"
-msgstr "Elk uur"
+#: ../../include/widgets.php:106
+msgid "New App"
+msgstr "Nieuwe app"
 
-#: ../../include/contact_selectors.php:58
-msgid "Twice daily"
-msgstr "Twee keer per dag"
+#: ../../include/widgets.php:154
+msgid "Suggestions"
+msgstr "Voorgestelde kanalen"
 
-#: ../../include/contact_selectors.php:59
-msgid "Daily"
-msgstr "Dagelijks"
+#: ../../include/widgets.php:155
+msgid "See more..."
+msgstr "Meer..."
 
-#: ../../include/contact_selectors.php:60
-msgid "Weekly"
-msgstr "Wekelijks"
+#: ../../include/widgets.php:175
+#, php-format
+msgid "You have %1$.0f of %2$.0f allowed connections."
+msgstr "Je hebt %1$.0f van de %2$.0f toegestane connecties."
 
-#: ../../include/contact_selectors.php:61
-msgid "Monthly"
-msgstr "Maandelijks"
+#: ../../include/widgets.php:181
+msgid "Add New Connection"
+msgstr "Nieuwe connectie toevoegen"
 
-#: ../../include/contact_selectors.php:76
-#: ../../include/contact_selectors.php:77
-msgid "Friendica"
-msgstr "Friendica"
+#: ../../include/widgets.php:182
+msgid "Enter channel address"
+msgstr "Vul kanaaladres in"
 
-#: ../../include/contact_selectors.php:78
-msgid "OStatus"
-msgstr "OStatus"
+#: ../../include/widgets.php:183
+msgid "Examples: bob@example.com, https://example.com/barbara"
+msgstr "Voorbeelden: bob@example.com, http://example.com/barbara"
 
-#: ../../include/contact_selectors.php:79
-msgid "GNU-Social"
-msgstr "GNU social"
+#: ../../include/widgets.php:199
+msgid "Notes"
+msgstr "Aantekeningen"
 
-#: ../../include/contact_selectors.php:80
-msgid "RSS/Atom"
-msgstr "RSS/Atom"
+#: ../../include/widgets.php:273
+msgid "Remove term"
+msgstr "Verwijder zoekterm"
 
-#: ../../include/contact_selectors.php:82
-msgid "Diaspora"
-msgstr "Diaspora"
+#: ../../include/widgets.php:281 ../../include/features.php:84
+msgid "Saved Searches"
+msgstr "Opgeslagen zoekopdrachten"
 
-#: ../../include/contact_selectors.php:83
-msgid "Facebook"
-msgstr "Facebook"
+#: ../../include/widgets.php:282 ../../include/group.php:316
+msgid "add"
+msgstr "toevoegen"
 
-#: ../../include/contact_selectors.php:84
-msgid "Zot"
-msgstr "Zot"
+#: ../../include/widgets.php:354
+msgid "Archives"
+msgstr "Archieven"
 
-#: ../../include/contact_selectors.php:85
-msgid "LinkedIn"
-msgstr "LinkedIn"
+#: ../../include/widgets.php:516
+msgid "Refresh"
+msgstr "Vernieuwen"
 
-#: ../../include/contact_selectors.php:86
-msgid "XMPP/IM"
-msgstr "XMPP/IM"
+#: ../../include/widgets.php:556
+msgid "Account settings"
+msgstr "Account"
 
-#: ../../include/contact_selectors.php:87
-msgid "MySpace"
-msgstr "MySpace"
+#: ../../include/widgets.php:562
+msgid "Channel settings"
+msgstr "Kanaal"
 
-#: ../../include/auth.php:105
-msgid "Logged out."
-msgstr "Uitgelogd."
+#: ../../include/widgets.php:571
+msgid "Additional features"
+msgstr "Extra functies"
 
-#: ../../include/auth.php:212
-msgid "Failed authentication"
-msgstr "Mislukte authenticatie"
+#: ../../include/widgets.php:578
+msgid "Feature/Addon settings"
+msgstr "Plugin-instellingen"
 
-#: ../../include/attach.php:247 ../../include/attach.php:333
-msgid "Item was not found."
-msgstr "Item niet gevonden"
+#: ../../include/widgets.php:584
+msgid "Display settings"
+msgstr "Weergave"
 
-#: ../../include/attach.php:497
-msgid "No source file."
-msgstr "Geen bronbestand."
+#: ../../include/widgets.php:591
+msgid "Manage locations"
+msgstr "Locaties beheren"
 
-#: ../../include/attach.php:519
-msgid "Cannot locate file to replace"
-msgstr "Kan het te vervangen bestand niet vinden"
+#: ../../include/widgets.php:600
+msgid "Export channel"
+msgstr "Kanaal exporteren"
 
-#: ../../include/attach.php:537
-msgid "Cannot locate file to revise/update"
-msgstr "Kan het bestand wat aangepast moet worden niet vinden"
+#: ../../include/widgets.php:607
+msgid "Connected apps"
+msgstr "Verbonden applicaties"
 
-#: ../../include/attach.php:672
-#, php-format
-msgid "File exceeds size limit of %d"
-msgstr "Bestand is groter dan de toegelaten %d"
+#: ../../include/widgets.php:622
+msgid "Premium Channel Settings"
+msgstr "Instellingen premiumkanaal"
 
-#: ../../include/attach.php:686
-#, php-format
-msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
-msgstr "Je hebt jouw limiet van %1$.0f MB opslagruimte voor bijlagen bereikt."
+#: ../../include/widgets.php:651
+msgid "Private Mail Menu"
+msgstr "Privéberichten"
 
-#: ../../include/attach.php:842
-msgid "File upload failed. Possible system limit or action terminated."
-msgstr "Uploaden van bestand mislukt. Mogelijk systeemlimiet bereikt of actie afgebroken."
+#: ../../include/widgets.php:653
+msgid "Combined View"
+msgstr "Gecombineerd postvak"
 
-#: ../../include/attach.php:855
-msgid "Stored file could not be verified. Upload failed."
-msgstr "Opgeslagen bestand kon niet worden geverifieerd. Uploaden mislukt."
+#: ../../include/widgets.php:685 ../../include/widgets.php:697
+msgid "Conversations"
+msgstr "Conversaties"
 
-#: ../../include/attach.php:909 ../../include/attach.php:925
-msgid "Path not available."
-msgstr "Pad niet beschikbaar."
+#: ../../include/widgets.php:689
+msgid "Received Messages"
+msgstr "Ontvangen berichten"
 
-#: ../../include/attach.php:971 ../../include/attach.php:1123
-msgid "Empty pathname"
-msgstr "Padnaam leeg"
+#: ../../include/widgets.php:693
+msgid "Sent Messages"
+msgstr "Verzonden berichten"
 
-#: ../../include/attach.php:997
-msgid "duplicate filename or path"
-msgstr "dubbele bestandsnaam of pad"
+#: ../../include/widgets.php:707
+msgid "No messages."
+msgstr "Geen berichten"
 
-#: ../../include/attach.php:1019
-msgid "Path not found."
-msgstr "Pad niet gevonden"
+#: ../../include/widgets.php:725
+msgid "Delete conversation"
+msgstr "Verwijder conversatie"
 
-#: ../../include/attach.php:1077
-msgid "mkdir failed."
-msgstr "directory aanmaken (mkdir) mislukt."
+#: ../../include/widgets.php:751
+msgid "Events Menu"
+msgstr "Agenda-menu"
 
-#: ../../include/attach.php:1081
-msgid "database storage failed."
-msgstr "opslag in database mislukt."
+#: ../../include/widgets.php:752
+msgid "Day View"
+msgstr "Dag tonen"
 
-#: ../../include/attach.php:1129
-msgid "Empty path"
-msgstr "Ontbrekend bestandspad"
+#: ../../include/widgets.php:753
+msgid "Week View"
+msgstr "Week tonen"
+
+#: ../../include/widgets.php:754
+msgid "Month View"
+msgstr "Maand tonen"
+
+#: ../../include/widgets.php:766
+msgid "Events Tools"
+msgstr "Agenda-hulpmiddelen"
+
+#: ../../include/widgets.php:767
+msgid "Export Calendar"
+msgstr "Exporteren"
+
+#: ../../include/widgets.php:768
+msgid "Import Calendar"
+msgstr "Importeren"
+
+#: ../../include/widgets.php:844
+msgid "Overview"
+msgstr "Overzicht"
+
+#: ../../include/widgets.php:851
+msgid "Chat Members"
+msgstr "Chatleden"
+
+#: ../../include/widgets.php:874
+msgid "Bookmarked Chatrooms"
+msgstr "Bladwijzers van chatkanalen"
+
+#: ../../include/widgets.php:897
+msgid "Suggested Chatrooms"
+msgstr "Voorgestelde chatkanalen"
+
+#: ../../include/widgets.php:1042 ../../include/widgets.php:1154
+msgid "photo/image"
+msgstr "foto/afbeelding"
+
+#: ../../include/widgets.php:1097
+msgid "Click to show more"
+msgstr "Klik voor meer"
+
+#: ../../include/widgets.php:1248
+msgid "Rating Tools"
+msgstr "Beoordelingen"
+
+#: ../../include/widgets.php:1252 ../../include/widgets.php:1254
+msgid "Rate Me"
+msgstr "Beoordeel mij"
+
+#: ../../include/widgets.php:1257
+msgid "View Ratings"
+msgstr "Bekijk beoordelingen"
+
+#: ../../include/widgets.php:1314
+msgid "Forums"
+msgstr "Forums"
+
+#: ../../include/widgets.php:1343
+msgid "Tasks"
+msgstr "Taken"
+
+#: ../../include/widgets.php:1352
+msgid "Documentation"
+msgstr "Documentatie"
+
+#: ../../include/widgets.php:1354
+msgid "Project/Site Information"
+msgstr "Project- en hub-informatie"
+
+#: ../../include/widgets.php:1355
+msgid "For Members"
+msgstr "Voor leden"
+
+#: ../../include/widgets.php:1356
+msgid "For Administrators"
+msgstr "Voor beheerders"
+
+#: ../../include/widgets.php:1357
+msgid "For Developers"
+msgstr "Voor ontwikkelaars"
+
+#: ../../include/widgets.php:1381
+msgid "Accounts"
+msgstr "Accounts"
+
+#: ../../include/widgets.php:1381 ../../include/widgets.php:1419
+msgid "Member registrations waiting for confirmation"
+msgstr "Accounts die op goedkeuring wachten"
+
+#: ../../include/widgets.php:1387
+msgid "Inspect queue"
+msgstr "Inspecteer berichtenwachtrij"
+
+#: ../../include/widgets.php:1389
+msgid "DB updates"
+msgstr "Database-updates"
+
+#: ../../include/widgets.php:1415
+msgid "Plugin Features"
+msgstr "Plugin-opties"
+
+#: ../../include/acl_selectors.php:232
+#: ../../include/PermissionDescription.php:31
+msgid "Visible to your default audience"
+msgstr "Voor iedereen zichtbaar, mits niet anders ingesteld"
+
+#: ../../include/acl_selectors.php:268
+#: ../../include/PermissionDescription.php:115
+msgid "Only me"
+msgstr "Alleen ik"
+
+#: ../../include/acl_selectors.php:271
+msgid "Who can see this?"
+msgstr "Wie kan dit zien?"
+
+#: ../../include/acl_selectors.php:272
+msgid "Custom selection"
+msgstr "Handmatige selectie"
+
+#: ../../include/acl_selectors.php:273
+msgid ""
+"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit"
+" the scope of \"Show\"."
+msgstr "Kies \"Tonen\" om weergave toe te staan.  Met \"Niet tonen\" kan je uitzonderingen maken op \"Tonen\"."
+
+#: ../../include/acl_selectors.php:274
+msgid "Show"
+msgstr "Tonen"
+
+#: ../../include/acl_selectors.php:275
+msgid "Don't show"
+msgstr "Niet tonen"
+
+#: ../../include/acl_selectors.php:281
+msgid "Other networks and post services"
+msgstr "Andere netwerken en diensten"
+
+#: ../../include/acl_selectors.php:311
+#, php-format
+msgid ""
+"Post permissions %s cannot be changed %s after a post is shared.</br />These"
+" permissions set who is allowed to view the post."
+msgstr "Permissies van berichten %s zijn niet meer te veranderen %s nadat een bericht is gedeeld.</br />Met deze permissies bepaal je wie het bericht kan zien."
 
-#: ../../include/datetime.php:136
+#: ../../include/datetime.php:135
 msgid "Birthday"
 msgstr "Verjaardag of geboortedatum"
 
-#: ../../include/datetime.php:138
+#: ../../include/datetime.php:137
 msgid "Age: "
 msgstr "Leeftijd:"
 
-#: ../../include/datetime.php:140
+#: ../../include/datetime.php:139
 msgid "YYYY-MM-DD or MM-DD"
 msgstr "JJJJ-MM-DD of MM-DD"
 
-#: ../../include/datetime.php:273 ../../boot.php:2399
+#: ../../include/datetime.php:272 ../../boot.php:2462
 msgid "never"
 msgstr "nooit"
 
-#: ../../include/datetime.php:279
+#: ../../include/datetime.php:278
 msgid "less than a second ago"
 msgstr "minder dan een seconde geleden"
 
-#: ../../include/datetime.php:297
+#: ../../include/datetime.php:296
 #, php-format
 msgctxt "e.g. 22 hours ago, 1 minute ago"
 msgid "%1$d %2$s ago"
 msgstr "%1$d %2$s geleden"
 
-#: ../../include/datetime.php:308
+#: ../../include/datetime.php:307
 msgctxt "relative_date"
 msgid "year"
 msgid_plural "years"
 msgstr[0] "jaar"
 msgstr[1] "jaren"
 
-#: ../../include/datetime.php:311
+#: ../../include/datetime.php:310
 msgctxt "relative_date"
 msgid "month"
 msgid_plural "months"
 msgstr[0] "maand"
 msgstr[1] "maanden"
 
-#: ../../include/datetime.php:314
+#: ../../include/datetime.php:313
 msgctxt "relative_date"
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "week"
 msgstr[1] "weken"
 
-#: ../../include/datetime.php:317
+#: ../../include/datetime.php:316
 msgctxt "relative_date"
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dag"
 msgstr[1] "dagen"
 
-#: ../../include/datetime.php:320
+#: ../../include/datetime.php:319
 msgctxt "relative_date"
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "uur"
 msgstr[1] "uren"
 
-#: ../../include/datetime.php:323
+#: ../../include/datetime.php:322
 msgctxt "relative_date"
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuut"
 msgstr[1] "minuten"
 
-#: ../../include/datetime.php:326
+#: ../../include/datetime.php:325
 msgctxt "relative_date"
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "seconde"
 msgstr[1] "seconden"
 
-#: ../../include/datetime.php:563
+#: ../../include/datetime.php:562
 #, php-format
 msgid "%1$s's birthday"
 msgstr "Verjaardag van %1$s"
 
-#: ../../include/datetime.php:564
+#: ../../include/datetime.php:563
 #, php-format
 msgid "Happy Birthday %1$s"
 msgstr "Gefeliciteerd met je verjaardag %1$s"
 
-#: ../../include/dir_fns.php:139
-msgid "Directory Options"
-msgstr "Opties kanalengids"
-
-#: ../../include/dir_fns.php:141
-msgid "Safe Mode"
-msgstr "Veilig zoeken"
-
-#: ../../include/dir_fns.php:142
-msgid "Public Forums Only"
-msgstr "Alleen openbare forums"
-
-#: ../../include/dir_fns.php:143
-msgid "This Website Only"
-msgstr "Alleen deze hub"
-
-#: ../../include/enotify.php:57 ../../include/network.php:1831
-msgid "$Projectname Notification"
-msgstr "$Projectname-notificatie"
-
-#: ../../include/enotify.php:58 ../../include/network.php:1832
-msgid "$projectname"
-msgstr "$projectname"
-
-#: ../../include/enotify.php:60 ../../include/network.php:1834
-msgid "Thank You,"
-msgstr "Bedankt,"
-
-#: ../../include/enotify.php:62 ../../include/network.php:1836
-#, php-format
-msgid "%s Administrator"
-msgstr "Beheerder %s"
-
-#: ../../include/enotify.php:96
-#, php-format
-msgid "%s <!item_type!>"
-msgstr "%s <!item_type!>"
-
-#: ../../include/enotify.php:100
-#, php-format
-msgid "[Hubzilla:Notify] New mail received at %s"
-msgstr "[Hubzilla:Notificatie] Nieuw privébericht ontvangen op %s"
-
-#: ../../include/enotify.php:102
-#, php-format
-msgid "%1$s, %2$s sent you a new private message at %3$s."
-msgstr "%1$s, %2$s zond jou een nieuw privébericht om %3$s."
-
-#: ../../include/enotify.php:103
-#, php-format
-msgid "%1$s sent you %2$s."
-msgstr "%1$s zond jou %2$s."
-
-#: ../../include/enotify.php:103
-msgid "a private message"
-msgstr "een privébericht"
+#: ../../include/account.php:28
+msgid "Not a valid email address"
+msgstr "Geen geldig e-mailadres"
 
-#: ../../include/enotify.php:104
-#, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
-msgstr "Bezoek %s om je privéberichten te bekijken en/of er op te reageren."
+#: ../../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/enotify.php:160
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
-msgstr "%1$s, %2$s gaf een reactie op [zrl=%3$s]een %4$s[/zrl]"
+#: ../../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/enotify.php:168
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
-msgstr "%1$s, %2$s gaf een reactie op [zrl=%3$s]een %5$s van %4$s[/zrl]"
+#: ../../include/account.php:68
+msgid "An invitation is required."
+msgstr "Een uitnodiging is vereist"
 
-#: ../../include/enotify.php:177
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
-msgstr "%1$s, %2$s gaf een reactie op [zrl=%3$s]jouw %4$s[/zrl]"
+#: ../../include/account.php:72
+msgid "Invitation could not be verified."
+msgstr "Uitnodiging kon niet geverifieerd worden"
 
-#: ../../include/enotify.php:188
-#, php-format
-msgid "[Hubzilla:Notify] Comment to conversation #%1$d by %2$s"
-msgstr "[Hubzilla:Notificatie] Reactie op conversatie #%1$d door %2$s"
+#: ../../include/account.php:122
+msgid "Please enter the required information."
+msgstr "Vul de vereiste informatie in."
 
-#: ../../include/enotify.php:189
-#, php-format
-msgid "%1$s, %2$s commented on an item/conversation you have been following."
-msgstr "%1$s, %2$s gaf een reactie op een bericht/conversatie die jij volgt."
+#: ../../include/account.php:189
+msgid "Failed to store account information."
+msgstr "Account-informatie kon niet opgeslagen worden."
 
-#: ../../include/enotify.php:192 ../../include/enotify.php:207
-#: ../../include/enotify.php:233 ../../include/enotify.php:251
-#: ../../include/enotify.php:265
+#: ../../include/account.php:249
 #, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
-msgstr "Bezoek %s om de conversatie te bekijken en/of er op te reageren."
+msgid "Registration confirmation for %s"
+msgstr "Registratiebevestiging voor %s"
 
-#: ../../include/enotify.php:198
+#: ../../include/account.php:315
 #, php-format
-msgid "[Hubzilla:Notify] %s posted to your profile wall"
-msgstr "[Hubzilla:Notificatie] %s heeft een bericht op jouw kanaal geplaatst"
+msgid "Registration request at %s"
+msgstr "Registratiebevestiging voor %s"
 
-#: ../../include/enotify.php:200
-#, php-format
-msgid "%1$s, %2$s posted to your profile wall at %3$s"
-msgstr "%1$s, %2$s heeft om %3$s een bericht op jouw kanaal geplaatst"
+#: ../../include/account.php:339
+msgid "your registration password"
+msgstr "jouw registratiewachtwoord"
 
-#: ../../include/enotify.php:202
+#: ../../include/account.php:342 ../../include/account.php:402
 #, php-format
-msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
-msgstr "%1$s, %2$s heeft een bericht op [zrl=%3$s]jouw kanaal[/zrl] geplaatst"
+msgid "Registration details for %s"
+msgstr "Registratiegegevens voor %s"
 
-#: ../../include/enotify.php:226
-#, php-format
-msgid "[Hubzilla:Notify] %s tagged you"
-msgstr "[Hubzilla:Notificatie] %s heeft je genoemd"
+#: ../../include/account.php:414
+msgid "Account approved."
+msgstr "Account goedgekeurd"
 
-#: ../../include/enotify.php:227
+#: ../../include/account.php:454
 #, php-format
-msgid "%1$s, %2$s tagged you at %3$s"
-msgstr "%1$s, %2$s noemde jou op %3$s"
+msgid "Registration revoked for %s"
+msgstr "Registratie ingetrokken voor %s"
 
-#: ../../include/enotify.php:228
-#, php-format
-msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
-msgstr "%1$s, %2$s [zrl=%3$s]noemde jou[/zrl]."
+#: ../../include/account.php:506
+msgid "Account verified. Please login."
+msgstr "Account is geverifieerd. Je kan inloggen."
 
-#: ../../include/enotify.php:240
-#, php-format
-msgid "[Hubzilla:Notify] %1$s poked you"
-msgstr "[Hubzilla:Notificatie] %1$s heeft je aangestoten"
+#: ../../include/account.php:723 ../../include/account.php:725
+msgid "Click here to upgrade."
+msgstr "Klik hier om te upgraden."
 
-#: ../../include/enotify.php:241
-#, php-format
-msgid "%1$s, %2$s poked you at %3$s"
-msgstr "%1$s, %2$s heeft je aangestoten op %3$s"
+#: ../../include/account.php:731
+msgid "This action exceeds the limits set by your subscription plan."
+msgstr "Deze handeling overschrijdt de beperkingen die voor jouw abonnement gelden."
 
-#: ../../include/enotify.php:242
-#, php-format
-msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
-msgstr "%1$s, %2$s [zrl=%2$s]heeft je aangestoten[/zrl]."
+#: ../../include/account.php:736
+msgid "This action is not available under your subscription plan."
+msgstr "Deze handeling is niet mogelijk met jouw abonnement."
 
-#: ../../include/enotify.php:258
-#, php-format
-msgid "[Hubzilla:Notify] %s tagged your post"
-msgstr "[Hubzilla:Notificatie] %s heeft jouw bericht getagd"
+#: ../../include/api.php:1336
+msgid "Public Timeline"
+msgstr "Openbare tijdlijn"
 
-#: ../../include/enotify.php:259
-#, php-format
-msgid "%1$s, %2$s tagged your post at %3$s"
-msgstr "%1$s, %2$s heeft jouw bericht om %3$s getagd"
+#: ../../include/auth.php:105
+msgid "Logged out."
+msgstr "Uitgelogd."
 
-#: ../../include/enotify.php:260
-#, php-format
-msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
-msgstr "%1$s, %2$s heeft [zrl=%3$s]jouw bericht[/zrl] getagd"
+#: ../../include/auth.php:212
+msgid "Failed authentication"
+msgstr "Mislukte authenticatie"
 
-#: ../../include/enotify.php:272
-msgid "[Hubzilla:Notify] Introduction received"
-msgstr "[Hubzilla:Notificatie] Connectieverzoek ontvangen"
+#: ../../include/follow.php:27
+msgid "Channel is blocked on this site."
+msgstr "Kanaal is op deze hub geblokkeerd."
 
-#: ../../include/enotify.php:273
-#, php-format
-msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
-msgstr "%1$s, je hebt een nieuw connectieverzoek ontvangen van '%2$s' op %3$s"
+#: ../../include/follow.php:32
+msgid "Channel location missing."
+msgstr "Ontbrekende kanaallocatie."
 
-#: ../../include/enotify.php:274
-#, php-format
-msgid ""
-"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
-msgstr "%1$s, je hebt een [zrl=%2$s]nieuw connectieverzoek[/zrl] ontvangen van %3$s."
+#: ../../include/follow.php:81
+msgid "Response from remote channel was incomplete."
+msgstr "Antwoord van het kanaal op afstand was niet volledig."
 
-#: ../../include/enotify.php:278 ../../include/enotify.php:297
-#, php-format
-msgid "You may visit their profile at %s"
-msgstr "Je kan het profiel bekijken op %s"
+#: ../../include/follow.php:98
+msgid "Channel was deleted and no longer exists."
+msgstr "Kanaal is verwijderd en bestaat niet meer."
 
-#: ../../include/enotify.php:280
-#, php-format
-msgid "Please visit %s to approve or reject the connection request."
-msgstr "Bezoek %s om het connectieverzoek te accepteren of af te wijzen."
+#: ../../include/follow.php:154 ../../include/follow.php:190
+msgid "Protocol disabled."
+msgstr "Protocol uitgeschakeld."
 
-#: ../../include/enotify.php:287
-msgid "[Hubzilla:Notify] Friend suggestion received"
-msgstr "[Hubzilla:Notificatie] Kanaalvoorstel ontvangen"
+#: ../../include/follow.php:178
+msgid "Channel discovery failed."
+msgstr "Kanaal ontdekken mislukt."
 
-#: ../../include/enotify.php:288
-#, php-format
-msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
-msgstr "%1$s, je hebt een kanaalvoorstel ontvangen van '%2$s' om %3$s"
+#: ../../include/follow.php:216
+msgid "Cannot connect to yourself."
+msgstr "Kan niet met jezelf verbinden"
 
-#: ../../include/enotify.php:289
-#, php-format
+#: ../../include/import.php:29
 msgid ""
-"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from "
-"%4$s."
-msgstr "%1$s, je hebt [zrl=%2$s]een kanaalvoorstel[/zrl] ontvangen voor %3$s van %4$s."
-
-#: ../../include/enotify.php:295
-msgid "Name:"
-msgstr "Naam:"
-
-#: ../../include/enotify.php:296
-msgid "Photo:"
-msgstr "Foto:"
-
-#: ../../include/enotify.php:299
-#, php-format
-msgid "Please visit %s to approve or reject the suggestion."
-msgstr "Bezoek %s om het voorstel te accepteren of af te wijzen."
-
-#: ../../include/enotify.php:514
-msgid "[Hubzilla:Notify]"
-msgstr "[Hubzilla:Notificatie]"
-
-#: ../../include/ItemObject.php:89 ../../include/conversation.php:664
-msgid "Private Message"
-msgstr "Niet voor iedereen zichtbaar"
-
-#: ../../include/ItemObject.php:126 ../../include/conversation.php:656
-msgid "Select"
-msgstr "Kies"
-
-#: ../../include/ItemObject.php:130
-msgid "Save to Folder"
-msgstr "In map opslaan"
-
-#: ../../include/ItemObject.php:151
-msgid "I will attend"
-msgstr "Aanwezig"
-
-#: ../../include/ItemObject.php:151
-msgid "I will not attend"
-msgstr "Niet aanwezig"
-
-#: ../../include/ItemObject.php:151
-msgid "I might attend"
-msgstr "Mogelijk aanwezig"
-
-#: ../../include/ItemObject.php:161
-msgid "I agree"
-msgstr "Eens"
-
-#: ../../include/ItemObject.php:161
-msgid "I disagree"
-msgstr "Oneens"
-
-#: ../../include/ItemObject.php:161
-msgid "I abstain"
-msgstr "Onthouding"
-
-#: ../../include/ItemObject.php:212
-msgid "Add Star"
-msgstr "Ster toevoegen"
-
-#: ../../include/ItemObject.php:213
-msgid "Remove Star"
-msgstr "Ster verwijderen"
-
-#: ../../include/ItemObject.php:214
-msgid "Toggle Star Status"
-msgstr "Ster toevoegen of verwijderen"
-
-#: ../../include/ItemObject.php:218
-msgid "starred"
-msgstr "met ster"
-
-#: ../../include/ItemObject.php:227 ../../include/conversation.php:671
-msgid "Message signature validated"
-msgstr "Berichtkenmerk gevalideerd"
-
-#: ../../include/ItemObject.php:228 ../../include/conversation.php:672
-msgid "Message signature incorrect"
-msgstr "Berichtkenmerk onjuist"
-
-#: ../../include/ItemObject.php:236
-msgid "Add Tag"
-msgstr "Tag toevoegen"
-
-#: ../../include/ItemObject.php:254 ../../include/taxonomy.php:316
-msgid "like"
-msgstr "vind dit leuk"
-
-#: ../../include/ItemObject.php:255 ../../include/taxonomy.php:317
-msgid "dislike"
-msgstr "vind dit niet leuk"
-
-#: ../../include/ItemObject.php:259
-msgid "Share This"
-msgstr "Delen"
-
-#: ../../include/ItemObject.php:259
-msgid "share"
-msgstr "delen"
-
-#: ../../include/ItemObject.php:268
-msgid "Delivery Report"
-msgstr "Afleveringsrapport"
-
-#: ../../include/ItemObject.php:286
-#, php-format
-msgid "%d comment"
-msgid_plural "%d comments"
-msgstr[0] "%d reactie"
-msgstr[1] "%d reacties weergeven"
-
-#: ../../include/ItemObject.php:315 ../../include/ItemObject.php:316
-#, php-format
-msgid "View %s's profile - %s"
-msgstr "Profiel van %s bekijken - %s"
+"Cannot create a duplicate channel identifier on this system. Import failed."
+msgstr "Kan geen dubbele kanaal-identificator op deze hub aanmaken. Importeren mislukt."
 
-#: ../../include/ItemObject.php:319
-msgid "to"
-msgstr "aan"
+#: ../../include/import.php:76
+msgid "Channel clone failed. Import failed."
+msgstr "Het klonen van het kanaal is mislukt. Importeren mislukt."
 
-#: ../../include/ItemObject.php:320
-msgid "via"
-msgstr "via"
+#: ../../include/items.php:892 ../../include/items.php:937
+msgid "(Unknown)"
+msgstr "(Onbekend)"
 
-#: ../../include/ItemObject.php:321
-msgid "Wall-to-Wall"
-msgstr "Kanaal-naar-kanaal"
+#: ../../include/items.php:1136
+msgid "Visible to anybody on the internet."
+msgstr "Voor iedereen op het internet zichtbaar."
 
-#: ../../include/ItemObject.php:322
-msgid "via Wall-To-Wall:"
-msgstr "via kanaal-naar-kanaal"
+#: ../../include/items.php:1138
+msgid "Visible to you only."
+msgstr "Alleen voor jou zichtbaar."
 
-#: ../../include/ItemObject.php:334 ../../include/conversation.php:719
-#, php-format
-msgid "from %s"
-msgstr "van %s"
+#: ../../include/items.php:1140
+msgid "Visible to anybody in this network."
+msgstr "Voor iedereen in dit netwerk zichtbaar."
 
-#: ../../include/ItemObject.php:337 ../../include/conversation.php:722
-#, php-format
-msgid "last edited: %s"
-msgstr "laatst bewerkt: %s"
+#: ../../include/items.php:1142
+msgid "Visible to anybody authenticated."
+msgstr "Voor iedereen die geauthenticeerd is zichtbaar."
 
-#: ../../include/ItemObject.php:338 ../../include/conversation.php:723
+#: ../../include/items.php:1144
 #, php-format
-msgid "Expires: %s"
-msgstr "Verloopt: %s"
-
-#: ../../include/ItemObject.php:362
-msgid "Save Bookmarks"
-msgstr "Bladwijzers opslaan"
-
-#: ../../include/ItemObject.php:363
-msgid "Add to Calendar"
-msgstr "Aan agenda toevoegen"
-
-#: ../../include/ItemObject.php:372
-msgid "Mark all seen"
-msgstr "Markeer alles als bekeken"
-
-#: ../../include/ItemObject.php:413 ../../include/js_strings.php:7
-msgid "[+] show all"
-msgstr "[+] alle"
-
-#: ../../include/ItemObject.php:704 ../../include/conversation.php:1221
-msgid "Bold"
-msgstr "Vet"
-
-#: ../../include/ItemObject.php:705 ../../include/conversation.php:1222
-msgid "Italic"
-msgstr "Cursief"
-
-#: ../../include/ItemObject.php:706 ../../include/conversation.php:1223
-msgid "Underline"
-msgstr "Onderstrepen"
-
-#: ../../include/ItemObject.php:707 ../../include/conversation.php:1224
-msgid "Quote"
-msgstr "Citeren"
-
-#: ../../include/ItemObject.php:708 ../../include/conversation.php:1225
-msgid "Code"
-msgstr "Broncode"
-
-#: ../../include/ItemObject.php:709
-msgid "Image"
-msgstr "Afbeelding"
-
-#: ../../include/ItemObject.php:710
-msgid "Insert Link"
-msgstr "Link invoegen"
-
-#: ../../include/ItemObject.php:711
-msgid "Video"
-msgstr "Video"
+msgid "Visible to anybody on %s."
+msgstr "Voor iedereen op %s zichtbaar."
 
-#: ../../include/activities.php:42
-msgid " and "
-msgstr " en "
+#: ../../include/items.php:1146
+msgid "Visible to all connections."
+msgstr "Voor alle connecties zichtbaar."
 
-#: ../../include/activities.php:50
-msgid "public profile"
-msgstr "openbaar profiel"
+#: ../../include/items.php:1148
+msgid "Visible to approved connections."
+msgstr "Voor alle geaccepteerde connecties zichtbaar."
 
-#: ../../include/activities.php:59
-#, php-format
-msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
-msgstr "%1$s veranderde %2$s naar &ldquo;%3$s&rdquo;"
+#: ../../include/items.php:1150
+msgid "Visible to specific connections."
+msgstr "Voor specifieke connecties zichtbaar."
 
-#: ../../include/activities.php:60
-#, php-format
-msgid "Visit %1$s's %2$s"
-msgstr "Bezoek het %2$s van %1$s"
+#: ../../include/items.php:3911
+msgid "Privacy group is empty."
+msgstr "Privacygroep is leeg"
 
-#: ../../include/activities.php:63
+#: ../../include/items.php:3918
 #, php-format
-msgid "%1$s has an updated %2$s, changing %3$s."
-msgstr "%1$s heeft een aangepaste %2$s, %3$s veranderd."
-
-#: ../../include/follow.php:28
-msgid "Channel is blocked on this site."
-msgstr "Kanaal is op deze hub geblokkeerd."
-
-#: ../../include/follow.php:33
-msgid "Channel location missing."
-msgstr "Ontbrekende kanaallocatie."
-
-#: ../../include/follow.php:82
-msgid "Response from remote channel was incomplete."
-msgstr "Antwoord van het kanaal op afstand was niet volledig."
-
-#: ../../include/follow.php:99
-msgid "Channel was deleted and no longer exists."
-msgstr "Kanaal is verwijderd en bestaat niet meer."
-
-#: ../../include/follow.php:155 ../../include/follow.php:191
-msgid "Protocol disabled."
-msgstr "Protocol uitgeschakeld."
+msgid "Privacy group: %s"
+msgstr "Privacygroep: %s"
 
-#: ../../include/follow.php:179
-msgid "Channel discovery failed."
-msgstr "Kanaal ontdekken mislukt."
+#: ../../include/items.php:3930
+msgid "Connection not found."
+msgstr "Connectie niet gevonden."
 
-#: ../../include/follow.php:217
-msgid "Cannot connect to yourself."
-msgstr "Kan niet met jezelf verbinden"
+#: ../../include/items.php:4279
+msgid "profile photo"
+msgstr "profielfoto"
 
 #: ../../include/features.php:48
 msgid "General Features"
@@ -8260,10 +8722,6 @@ msgstr "Berichtenfilters"
 msgid "Filter incoming posts from connections based on keywords/content"
 msgstr "Filter binnenkomende berichten van connecties aan de hand van trefwoorden en taal"
 
-#: ../../include/features.php:89 ../../include/apps.php:162
-msgid "Suggest Channels"
-msgstr "Kanalen voorstellen"
-
 #: ../../include/features.php:89
 msgid "Show channel suggestions"
 msgstr "Voor jou mogelijk interessante kanalen voorstellen"
@@ -8316,35 +8774,6 @@ msgstr "Tagwolk"
 msgid "Provide a personal tag cloud on your channel page"
 msgstr "Zorgt voor een persoonlijke wolk met tags op jouw kanaalpagina"
 
-#: ../../include/message.php:20
-msgid "No recipient provided."
-msgstr "Geen ontvanger opgegeven."
-
-#: ../../include/message.php:25
-msgid "[no subject]"
-msgstr "[geen onderwerp]"
-
-#: ../../include/message.php:45
-msgid "Unable to determine sender."
-msgstr "Afzender kan niet bepaald worden."
-
-#: ../../include/message.php:222
-msgid "Stored post could not be verified."
-msgstr "Opgeslagen bericht kon niet worden geverifieerd."
-
-#: ../../include/network.php:659
-msgid "view full size"
-msgstr "volledige grootte tonen"
-
-#: ../../include/network.php:1879 ../../include/account.php:317
-#: ../../include/account.php:344 ../../include/account.php:404
-msgid "Administrator"
-msgstr "Beheerder"
-
-#: ../../include/network.php:1893
-msgid "No Subject"
-msgstr "Geen onderwerp"
-
 #: ../../include/group.php:26
 msgid ""
 "A deleted group with this name was revived. Existing item permissions "
@@ -8372,672 +8801,307 @@ msgstr "Privacygroep toevoegen"
 msgid "Channels not in any privacy group"
 msgstr "Kanalen die zich in geen enkele privacygroep bevinden"
 
-#: ../../include/bbcode.php:123 ../../include/bbcode.php:848
-#: ../../include/bbcode.php:851 ../../include/bbcode.php:856
-#: ../../include/bbcode.php:859 ../../include/bbcode.php:862
-#: ../../include/bbcode.php:865 ../../include/bbcode.php:870
-#: ../../include/bbcode.php:873 ../../include/bbcode.php:878
-#: ../../include/bbcode.php:881 ../../include/bbcode.php:884
-#: ../../include/bbcode.php:887
-msgid "Image/photo"
-msgstr "Afbeelding/foto"
-
-#: ../../include/bbcode.php:162 ../../include/bbcode.php:898
-msgid "Encrypted content"
-msgstr "Versleutelde inhoud"
-
-#: ../../include/bbcode.php:179
-#, php-format
-msgid "Install %s element: "
-msgstr "Installeer %s-element: "
-
-#: ../../include/bbcode.php:183
-#, php-format
-msgid ""
-"This post contains an installable %s element, however you lack permissions "
-"to install it on this site."
-msgstr "Dit bericht heeft een te installeren %s-element, maar je hebt geen permissies om het op deze hub te installeren."
-
-#: ../../include/bbcode.php:255
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
-msgstr "%1$s schreef het volgende %2$s %3$s"
-
-#: ../../include/bbcode.php:333 ../../include/bbcode.php:341
-msgid "Click to open/close"
-msgstr "Klik om te openen of te sluiten"
-
-#: ../../include/bbcode.php:341
-msgid "spoiler"
-msgstr "spoiler"
-
-#: ../../include/bbcode.php:586
-msgid "Different viewers will see this text differently"
-msgstr "Deze tekst wordt per persoon anders weergeven."
-
-#: ../../include/bbcode.php:836
-msgid "$1 wrote:"
-msgstr "$1 schreef:"
-
-#: ../../include/conversation.php:204
-#, php-format
-msgid "%1$s is now connected with %2$s"
-msgstr "%1$s is nu met %2$s verbonden"
-
-#: ../../include/conversation.php:239
-#, php-format
-msgid "%1$s poked %2$s"
-msgstr "%1$s heeft %2$s aangestoten"
-
-#: ../../include/conversation.php:243 ../../include/text.php:1021
-#: ../../include/text.php:1026
-msgid "poked"
-msgstr "aangestoten"
-
-#: ../../include/conversation.php:691
-#, php-format
-msgid "View %s's profile @ %s"
-msgstr "Bekijk het profiel van %s @ %s"
-
-#: ../../include/conversation.php:710
-msgid "Categories:"
-msgstr "Categorieën:"
-
-#: ../../include/conversation.php:711
-msgid "Filed under:"
-msgstr "Bewaard onder:"
-
-#: ../../include/conversation.php:738
-msgid "View in context"
-msgstr "In context bekijken"
-
-#: ../../include/conversation.php:850
-msgid "remove"
-msgstr "verwijderen"
-
-#: ../../include/conversation.php:855
-msgid "Delete Selected Items"
-msgstr "Verwijder de geselecteerde items"
-
-#: ../../include/conversation.php:953
-msgid "View Source"
-msgstr "Bron weergeven"
-
-#: ../../include/conversation.php:954
-msgid "Follow Thread"
-msgstr "Conversatie volgen"
-
-#: ../../include/conversation.php:955
-msgid "Unfollow Thread"
-msgstr "Conversatie niet meer volgen"
-
-#: ../../include/conversation.php:960
-msgid "Activity/Posts"
-msgstr "Activiteit/berichten connectie"
-
-#: ../../include/conversation.php:962
-msgid "Edit Connection"
-msgstr "Connectie bewerken"
-
-#: ../../include/conversation.php:963
-msgid "Message"
-msgstr "Bericht"
-
-#: ../../include/conversation.php:1080
-#, php-format
-msgid "%s likes this."
-msgstr "%s vindt dit leuk."
-
-#: ../../include/conversation.php:1080
-#, php-format
-msgid "%s doesn't like this."
-msgstr "%s vindt dit niet leuk."
-
-#: ../../include/conversation.php:1084
-#, 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] "<span  %1$s>%2$d persoon</span> vindt dit leuk."
-msgstr[1] "<span  %1$s>%2$d personen</span> vinden dit leuk."
-
-#: ../../include/conversation.php:1086
-#, 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] "<span  %1$s>%2$d persoon</span> vindt dit niet leuk."
-msgstr[1] "<span  %1$s>%2$d personen</span> vinden dit niet leuk."
-
-#: ../../include/conversation.php:1092
-msgid "and"
-msgstr "en"
-
-#: ../../include/conversation.php:1095
-#, php-format
-msgid ", and %d other people"
-msgid_plural ", and %d other people"
-msgstr[0] ", en %d ander persoon"
-msgstr[1] ", en %d andere personen"
-
-#: ../../include/conversation.php:1096
-#, php-format
-msgid "%s like this."
-msgstr "%s vinden dit leuk."
-
-#: ../../include/conversation.php:1096
-#, php-format
-msgid "%s don't like this."
-msgstr "%s vinden dit niet leuk."
-
-#: ../../include/conversation.php:1136
-msgid "Set your location"
-msgstr "Locatie instellen"
-
-#: ../../include/conversation.php:1137
-msgid "Clear browser location"
-msgstr "Locatie van webbrowser wissen"
-
-#: ../../include/conversation.php:1183
-msgid "Tag term:"
-msgstr "Tag:"
-
-#: ../../include/conversation.php:1184
-msgid "Where are you right now?"
-msgstr "Waar bevind je je op dit moment?"
-
-#: ../../include/conversation.php:1216
-msgid "Page link name"
-msgstr "Linknaam pagina"
-
-#: ../../include/conversation.php:1219
-msgid "Post as"
-msgstr "Bericht plaatsen als"
-
-#: ../../include/conversation.php:1229
-msgid "Toggle voting"
-msgstr "Peiling in- of uitschakelen"
-
-#: ../../include/conversation.php:1237
-msgid "Categories (optional, comma-separated list)"
-msgstr "Categorieën (optioneel, door komma's gescheiden lijst)"
-
-#: ../../include/conversation.php:1260
-msgid "Set publish date"
-msgstr "Publicatiedatum instellen"
-
-#: ../../include/conversation.php:1264
-msgid "OK"
-msgstr "OK"
-
-#: ../../include/conversation.php:1509
-msgid "Discover"
-msgstr "Ontdekken"
-
-#: ../../include/conversation.php:1512
-msgid "Imported public streams"
-msgstr "Openbare streams importeren"
-
-#: ../../include/conversation.php:1517
-msgid "Commented Order"
-msgstr "Nieuwe reacties bovenaan"
-
-#: ../../include/conversation.php:1520
-msgid "Sort by Comment Date"
-msgstr "Berichten met nieuwe reacties bovenaan"
-
-#: ../../include/conversation.php:1524
-msgid "Posted Order"
-msgstr "Nieuwe berichten bovenaan"
-
-#: ../../include/conversation.php:1527
-msgid "Sort by Post Date"
-msgstr "Nieuwe berichten bovenaan"
-
-#: ../../include/conversation.php:1535
-msgid "Posts that mention or involve you"
-msgstr "Alleen berichten die jou vermelden of waar je op een andere manier bij betrokken bent"
-
-#: ../../include/conversation.php:1544
-msgid "Activity Stream - by date"
-msgstr "Activiteitenstroom - volgens datum"
-
-#: ../../include/conversation.php:1550
-msgid "Starred"
-msgstr "Met ster"
-
-#: ../../include/conversation.php:1553
-msgid "Favourite Posts"
-msgstr "Favoriete berichten"
-
-#: ../../include/conversation.php:1560
-msgid "Spam"
-msgstr "Spam"
-
-#: ../../include/conversation.php:1563
-msgid "Posts flagged as SPAM"
-msgstr "Berichten gemarkeerd als SPAM"
-
-#: ../../include/conversation.php:1620
-msgid "Status Messages and Posts"
-msgstr "Berichten in dit kanaal"
-
-#: ../../include/conversation.php:1629
-msgid "About"
-msgstr "Over"
-
-#: ../../include/conversation.php:1632
-msgid "Profile Details"
-msgstr "Profiel"
-
-#: ../../include/conversation.php:1648
-msgid "Files and Storage"
-msgstr "Bestanden en opslagruimte"
-
-#: ../../include/conversation.php:1685
-msgid "Saved Bookmarks"
-msgstr "Opgeslagen bladwijzers"
-
-#: ../../include/conversation.php:1695
-msgid "Manage Webpages"
-msgstr "Webpagina's beheren"
-
-#: ../../include/conversation.php:1754
-msgctxt "noun"
-msgid "Attending"
-msgid_plural "Attending"
-msgstr[0] "aanwezig"
-msgstr[1] "aanwezig"
-
-#: ../../include/conversation.php:1757
-msgctxt "noun"
-msgid "Not Attending"
-msgid_plural "Not Attending"
-msgstr[0] "niet aanwezig"
-msgstr[1] "niet aanwezig"
-
-#: ../../include/conversation.php:1760
-msgctxt "noun"
-msgid "Undecided"
-msgid_plural "Undecided"
-msgstr[0] "nog niet beslist"
-msgstr[1] "nog niet beslist"
-
-#: ../../include/conversation.php:1763
-msgctxt "noun"
-msgid "Agree"
-msgid_plural "Agrees"
-msgstr[0] "eens"
-msgstr[1] "eens"
-
-#: ../../include/conversation.php:1766
-msgctxt "noun"
-msgid "Disagree"
-msgid_plural "Disagrees"
-msgstr[0] "oneens"
-msgstr[1] "oneens"
-
-#: ../../include/conversation.php:1769
-msgctxt "noun"
-msgid "Abstain"
-msgid_plural "Abstains"
-msgstr[0] "onthouding"
-msgstr[1] "onthoudingen"
-
-#: ../../include/text.php:423
+#: ../../include/text.php:428
 msgid "prev"
 msgstr "vorige"
 
-#: ../../include/text.php:425
+#: ../../include/text.php:430
 msgid "first"
 msgstr "eerste"
 
-#: ../../include/text.php:454
+#: ../../include/text.php:459
 msgid "last"
 msgstr "laatste"
 
-#: ../../include/text.php:457
+#: ../../include/text.php:462
 msgid "next"
 msgstr "volgende"
 
-#: ../../include/text.php:467
+#: ../../include/text.php:472
 msgid "older"
 msgstr "ouder"
 
-#: ../../include/text.php:469
+#: ../../include/text.php:474
 msgid "newer"
 msgstr "nieuwer"
 
-#: ../../include/text.php:851
+#: ../../include/text.php:863
 msgid "No connections"
 msgstr "Geen connecties"
 
-#: ../../include/text.php:876
+#: ../../include/text.php:888
 #, php-format
 msgid "View all %s connections"
 msgstr "Toon alle %s connecties"
 
-#: ../../include/text.php:1021 ../../include/text.php:1026
+#: ../../include/text.php:1033 ../../include/text.php:1038
 msgid "poke"
 msgstr "aanstoten"
 
-#: ../../include/text.php:1027
+#: ../../include/text.php:1039
 msgid "ping"
 msgstr "ping"
 
-#: ../../include/text.php:1027
+#: ../../include/text.php:1039
 msgid "pinged"
 msgstr "gepingd"
 
-#: ../../include/text.php:1028
+#: ../../include/text.php:1040
 msgid "prod"
 msgstr "por"
 
-#: ../../include/text.php:1028
+#: ../../include/text.php:1040
 msgid "prodded"
 msgstr "gepord"
 
-#: ../../include/text.php:1029
+#: ../../include/text.php:1041
 msgid "slap"
 msgstr "slaan"
 
-#: ../../include/text.php:1029
+#: ../../include/text.php:1041
 msgid "slapped"
 msgstr "sloeg"
 
-#: ../../include/text.php:1030
+#: ../../include/text.php:1042
 msgid "finger"
 msgstr "finger"
 
-#: ../../include/text.php:1030
+#: ../../include/text.php:1042
 msgid "fingered"
 msgstr "gefingerd"
 
-#: ../../include/text.php:1031
+#: ../../include/text.php:1043
 msgid "rebuff"
 msgstr "afpoeieren"
 
-#: ../../include/text.php:1031
+#: ../../include/text.php:1043
 msgid "rebuffed"
 msgstr "afgepoeierd"
 
-#: ../../include/text.php:1043
+#: ../../include/text.php:1055
 msgid "happy"
 msgstr "gelukkig"
 
-#: ../../include/text.php:1044
+#: ../../include/text.php:1056
 msgid "sad"
 msgstr "bedroefd"
 
-#: ../../include/text.php:1045
+#: ../../include/text.php:1057
 msgid "mellow"
 msgstr "mellow"
 
-#: ../../include/text.php:1046
+#: ../../include/text.php:1058
 msgid "tired"
 msgstr "moe"
 
-#: ../../include/text.php:1047
+#: ../../include/text.php:1059
 msgid "perky"
 msgstr "parmantig"
 
-#: ../../include/text.php:1048
+#: ../../include/text.php:1060
 msgid "angry"
 msgstr "boos"
 
-#: ../../include/text.php:1049
+#: ../../include/text.php:1061
 msgid "stupefied"
 msgstr "verbijsterd"
 
-#: ../../include/text.php:1050
+#: ../../include/text.php:1062
 msgid "puzzled"
 msgstr "verward"
 
-#: ../../include/text.php:1051
+#: ../../include/text.php:1063
 msgid "interested"
 msgstr "geïnteresseerd"
 
-#: ../../include/text.php:1052
+#: ../../include/text.php:1064
 msgid "bitter"
 msgstr "verbitterd"
 
-#: ../../include/text.php:1053
+#: ../../include/text.php:1065
 msgid "cheerful"
 msgstr "vrolijk"
 
-#: ../../include/text.php:1054
+#: ../../include/text.php:1066
 msgid "alive"
 msgstr "levendig"
 
-#: ../../include/text.php:1055
+#: ../../include/text.php:1067
 msgid "annoyed"
 msgstr "geërgerd"
 
-#: ../../include/text.php:1056
+#: ../../include/text.php:1068
 msgid "anxious"
 msgstr "bezorgd"
 
-#: ../../include/text.php:1057
+#: ../../include/text.php:1069
 msgid "cranky"
 msgstr "humeurig"
 
-#: ../../include/text.php:1058
+#: ../../include/text.php:1070
 msgid "disturbed"
 msgstr "verontrust"
 
-#: ../../include/text.php:1059
+#: ../../include/text.php:1071
 msgid "frustrated"
 msgstr "gefrustreerd "
 
-#: ../../include/text.php:1060
+#: ../../include/text.php:1072
 msgid "depressed"
 msgstr "gedeprimeerd"
 
-#: ../../include/text.php:1061
+#: ../../include/text.php:1073
 msgid "motivated"
 msgstr "gemotiveerd"
 
-#: ../../include/text.php:1062
+#: ../../include/text.php:1074
 msgid "relaxed"
 msgstr "ontspannen"
 
-#: ../../include/text.php:1063
+#: ../../include/text.php:1075
 msgid "surprised"
 msgstr "verrast"
 
-#: ../../include/text.php:1235 ../../include/js_strings.php:70
+#: ../../include/text.php:1242 ../../include/js_strings.php:70
 msgid "Monday"
 msgstr "maandag"
 
-#: ../../include/text.php:1235 ../../include/js_strings.php:71
+#: ../../include/text.php:1242 ../../include/js_strings.php:71
 msgid "Tuesday"
 msgstr "dinsdag"
 
-#: ../../include/text.php:1235 ../../include/js_strings.php:72
+#: ../../include/text.php:1242 ../../include/js_strings.php:72
 msgid "Wednesday"
 msgstr "woensdag"
 
-#: ../../include/text.php:1235 ../../include/js_strings.php:73
+#: ../../include/text.php:1242 ../../include/js_strings.php:73
 msgid "Thursday"
 msgstr "donderdag"
 
-#: ../../include/text.php:1235 ../../include/js_strings.php:74
+#: ../../include/text.php:1242 ../../include/js_strings.php:74
 msgid "Friday"
 msgstr "vrijdag"
 
-#: ../../include/text.php:1235 ../../include/js_strings.php:75
+#: ../../include/text.php:1242 ../../include/js_strings.php:75
 msgid "Saturday"
 msgstr "zaterdag"
 
-#: ../../include/text.php:1235 ../../include/js_strings.php:69
+#: ../../include/text.php:1242 ../../include/js_strings.php:69
 msgid "Sunday"
 msgstr "zondag"
 
-#: ../../include/text.php:1239 ../../include/js_strings.php:45
+#: ../../include/text.php:1246 ../../include/js_strings.php:45
 msgid "January"
 msgstr "januari"
 
-#: ../../include/text.php:1239 ../../include/js_strings.php:46
+#: ../../include/text.php:1246 ../../include/js_strings.php:46
 msgid "February"
 msgstr "februari"
 
-#: ../../include/text.php:1239 ../../include/js_strings.php:47
+#: ../../include/text.php:1246 ../../include/js_strings.php:47
 msgid "March"
 msgstr "maart"
 
-#: ../../include/text.php:1239 ../../include/js_strings.php:48
+#: ../../include/text.php:1246 ../../include/js_strings.php:48
 msgid "April"
 msgstr "april"
 
-#: ../../include/text.php:1239
+#: ../../include/text.php:1246
 msgid "May"
 msgstr "mei"
 
-#: ../../include/text.php:1239 ../../include/js_strings.php:50
+#: ../../include/text.php:1246 ../../include/js_strings.php:50
 msgid "June"
 msgstr "juni"
 
-#: ../../include/text.php:1239 ../../include/js_strings.php:51
+#: ../../include/text.php:1246 ../../include/js_strings.php:51
 msgid "July"
 msgstr "juli"
 
-#: ../../include/text.php:1239 ../../include/js_strings.php:52
+#: ../../include/text.php:1246 ../../include/js_strings.php:52
 msgid "August"
 msgstr "augustus"
 
-#: ../../include/text.php:1239 ../../include/js_strings.php:53
+#: ../../include/text.php:1246 ../../include/js_strings.php:53
 msgid "September"
 msgstr "september"
 
-#: ../../include/text.php:1239 ../../include/js_strings.php:54
+#: ../../include/text.php:1246 ../../include/js_strings.php:54
 msgid "October"
 msgstr "oktober"
 
-#: ../../include/text.php:1239 ../../include/js_strings.php:55
+#: ../../include/text.php:1246 ../../include/js_strings.php:55
 msgid "November"
 msgstr "november"
 
-#: ../../include/text.php:1239 ../../include/js_strings.php:56
+#: ../../include/text.php:1246 ../../include/js_strings.php:56
 msgid "December"
 msgstr "december"
 
-#: ../../include/text.php:1316 ../../include/text.php:1320
+#: ../../include/text.php:1323 ../../include/text.php:1327
 msgid "Unknown Attachment"
 msgstr "Onbekende bijlage"
 
-#: ../../include/text.php:1322
+#: ../../include/text.php:1329
 msgid "unknown"
 msgstr "onbekend"
 
-#: ../../include/text.php:1358
+#: ../../include/text.php:1365
 msgid "remove category"
 msgstr "categorie verwijderen"
 
-#: ../../include/text.php:1435
+#: ../../include/text.php:1442
 msgid "remove from file"
 msgstr "uit map verwijderen"
 
-#: ../../include/text.php:1764 ../../include/text.php:1836
+#: ../../include/text.php:1738 ../../include/text.php:1809
 msgid "default"
 msgstr "standaard"
 
-#: ../../include/text.php:1772
+#: ../../include/text.php:1746
 msgid "Page layout"
 msgstr "Pagina-lay-out"
 
-#: ../../include/text.php:1772
+#: ../../include/text.php:1746
 msgid "You can create your own with the layouts tool"
 msgstr "Je kan jouw eigen lay-out ontwerpen onder lay-outs"
 
-#: ../../include/text.php:1814
+#: ../../include/text.php:1788
 msgid "Page content type"
 msgstr "Opmaaktype pagina"
 
-#: ../../include/text.php:1848
+#: ../../include/text.php:1821
 msgid "Select an alternate language"
 msgstr "Kies een andere taal"
 
-#: ../../include/text.php:1965
+#: ../../include/text.php:1938
 msgid "activity"
 msgstr "activiteit"
 
-#: ../../include/text.php:2274
+#: ../../include/text.php:2247
 msgid "Design Tools"
 msgstr "Ontwerp-hulpmiddelen"
 
-#: ../../include/text.php:2280
+#: ../../include/text.php:2253
 msgid "Pages"
 msgstr "Pagina's"
 
-#: ../../include/account.php:28
-msgid "Not a valid email address"
-msgstr "Geen geldig e-mailadres"
-
-#: ../../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:36
-msgid "Your email address is already registered at this site."
-msgstr "Jouw e-mailadres is al op deze hub geregistreerd."
-
-#: ../../include/account.php:68
-msgid "An invitation is required."
-msgstr "Een uitnodiging is vereist"
-
-#: ../../include/account.php:72
-msgid "Invitation could not be verified."
-msgstr "Uitnodiging kon niet geverifieerd worden"
-
-#: ../../include/account.php:122
-msgid "Please enter the required information."
-msgstr "Vul de vereiste informatie in."
-
-#: ../../include/account.php:189
-msgid "Failed to store account information."
-msgstr "Account-informatie kon niet opgeslagen worden."
-
-#: ../../include/account.php:249
-#, php-format
-msgid "Registration confirmation for %s"
-msgstr "Registratiebevestiging voor %s"
-
-#: ../../include/account.php:315
-#, php-format
-msgid "Registration request at %s"
-msgstr "Registratiebevestiging voor %s"
-
-#: ../../include/account.php:339
-msgid "your registration password"
-msgstr "jouw registratiewachtwoord"
-
-#: ../../include/account.php:342 ../../include/account.php:402
-#, php-format
-msgid "Registration details for %s"
-msgstr "Registratiegegevens voor %s"
+#: ../../include/zot.php:699
+msgid "Invalid data packet"
+msgstr "Datapakket ongeldig"
 
-#: ../../include/account.php:414
-msgid "Account approved."
-msgstr "Account goedgekeurd"
+#: ../../include/zot.php:715
+msgid "Unable to verify channel signature"
+msgstr "Kanaalkenmerk kon niet worden geverifieerd.  "
 
-#: ../../include/account.php:454
+#: ../../include/zot.php:2363
 #, php-format
-msgid "Registration revoked for %s"
-msgstr "Registratie ingetrokken voor %s"
-
-#: ../../include/account.php:506
-msgid "Account verified. Please login."
-msgstr "Account is geverifieerd. Je kan inloggen."
-
-#: ../../include/account.php:722 ../../include/account.php:724
-msgid "Click here to upgrade."
-msgstr "Klik hier om te upgraden."
-
-#: ../../include/account.php:730
-msgid "This action exceeds the limits set by your subscription plan."
-msgstr "Deze handeling overschrijdt de beperkingen die voor jouw abonnement gelden."
+msgid "Unable to verify site signature for %s"
+msgstr "Hubkenmerk voor %s kon niet worden geverifieerd"
 
-#: ../../include/account.php:735
-msgid "This action is not available under your subscription plan."
-msgstr "Deze handeling is niet mogelijk met jouw abonnement."
+#: ../../include/zot.php:3712
+msgid "invalid target signature"
+msgstr "ongeldig doelkenmerk"
 
 #: ../../include/taxonomy.php:228 ../../include/taxonomy.php:249
 msgid "Tags"
@@ -9071,69 +9135,6 @@ msgstr "vindt dit leuk"
 msgid "dislikes"
 msgstr "vindt dit niet leuk"
 
-#: ../../include/PermissionDescription.php:31
-#: ../../include/acl_selectors.php:236
-msgid "Visible to your default audience"
-msgstr "Voor iedereen zichtbaar, mits niet anders ingesteld"
-
-#: ../../include/PermissionDescription.php:115
-#: ../../include/acl_selectors.php:272
-msgid "Only me"
-msgstr "Alleen ik"
-
-#: ../../include/PermissionDescription.php:116
-msgid "Public"
-msgstr "Openbaar"
-
-#: ../../include/PermissionDescription.php:117
-msgid "Anybody in the $Projectname network"
-msgstr "Iedereen in het $Projectname-netwerk"
-
-#: ../../include/PermissionDescription.php:118
-#, php-format
-msgid "Any account on %s"
-msgstr "Iedereen op %s"
-
-#: ../../include/PermissionDescription.php:119
-msgid "Any of my connections"
-msgstr "Al mijn geaccepteerde connecties"
-
-#: ../../include/PermissionDescription.php:120
-msgid "Only connections I specifically allow"
-msgstr "Alleen connecties die uitdrukkelijk door jou zijn toegestaan"
-
-#: ../../include/PermissionDescription.php:121
-msgid "Anybody authenticated (could include visitors from other networks)"
-msgstr "Geauthenticeerde leden  (kan bezoekers van andere netwerken bevatten)"
-
-#: ../../include/PermissionDescription.php:122
-msgid "Any connections including those who haven't yet been approved"
-msgstr "Al mijn geaccepteerde en nog niet geaccepteerde connecties"
-
-#: ../../include/PermissionDescription.php:161
-msgid ""
-"This is your default setting for the audience of your normal stream, and "
-"posts."
-msgstr "Dit is de standaard privacy-instelling voor wie jouw berichten kan bekijken"
-
-#: ../../include/PermissionDescription.php:162
-msgid ""
-"This is your default setting for who can view your default channel profile"
-msgstr "Dit is de standaard privacy-instelling voor wie jouw standaardprofiel kan bekijken"
-
-#: ../../include/PermissionDescription.php:163
-msgid "This is your default setting for who can view your connections"
-msgstr "Dit is de standaard privacy-instelling voor wie een lijst met jouw connecties kan bekijken"
-
-#: ../../include/PermissionDescription.php:164
-msgid ""
-"This is your default setting for who can view your file storage and photos"
-msgstr "Dit is de standaard privacy-instelling voor wie jouw bestanden en foto's kan bekijken"
-
-#: ../../include/PermissionDescription.php:165
-msgid "This is your default setting for the audience of your webpages"
-msgstr "Dit is de standaard privacy-instelling voor wie jouw webpagina's kan bekijken"
-
 #: ../../include/js_strings.php:5
 msgid "Delete this item?"
 msgstr "Dit item verwijderen?"
@@ -9378,68 +9379,97 @@ msgctxt "calendar"
 msgid "All day"
 msgstr "hele dag"
 
-#: ../../include/import.php:27
-msgid ""
-"Cannot create a duplicate channel identifier on this system. Import failed."
-msgstr "Kan geen dubbele kanaal-identificator op deze hub aanmaken. Importeren mislukt."
+#: ../../include/PermissionDescription.php:116
+msgid "Public"
+msgstr "Openbaar"
 
-#: ../../include/import.php:74
-msgid "Channel clone failed. Import failed."
-msgstr "Het klonen van het kanaal is mislukt. Importeren mislukt."
+#: ../../include/PermissionDescription.php:117
+msgid "Anybody in the $Projectname network"
+msgstr "Iedereen in het $Projectname-netwerk"
 
-#: ../../include/items.php:890 ../../include/items.php:935
-msgid "(Unknown)"
-msgstr "(Onbekend)"
+#: ../../include/PermissionDescription.php:118
+#, php-format
+msgid "Any account on %s"
+msgstr "Iedereen op %s"
 
-#: ../../include/items.php:1134
-msgid "Visible to anybody on the internet."
-msgstr "Voor iedereen op het internet zichtbaar."
+#: ../../include/PermissionDescription.php:119
+msgid "Any of my connections"
+msgstr "Al mijn geaccepteerde connecties"
 
-#: ../../include/items.php:1136
-msgid "Visible to you only."
-msgstr "Alleen voor jou zichtbaar."
+#: ../../include/PermissionDescription.php:120
+msgid "Only connections I specifically allow"
+msgstr "Alleen connecties die uitdrukkelijk door jou zijn toegestaan"
 
-#: ../../include/items.php:1138
-msgid "Visible to anybody in this network."
-msgstr "Voor iedereen in dit netwerk zichtbaar."
+#: ../../include/PermissionDescription.php:121
+msgid "Anybody authenticated (could include visitors from other networks)"
+msgstr "Geauthenticeerde leden  (kan bezoekers van andere netwerken bevatten)"
 
-#: ../../include/items.php:1140
-msgid "Visible to anybody authenticated."
-msgstr "Voor iedereen die geauthenticeerd is zichtbaar."
+#: ../../include/PermissionDescription.php:122
+msgid "Any connections including those who haven't yet been approved"
+msgstr "Al mijn geaccepteerde en nog niet geaccepteerde connecties"
 
-#: ../../include/items.php:1142
-#, php-format
-msgid "Visible to anybody on %s."
-msgstr "Voor iedereen op %s zichtbaar."
+#: ../../include/PermissionDescription.php:161
+msgid ""
+"This is your default setting for the audience of your normal stream, and "
+"posts."
+msgstr "Dit is de standaard privacy-instelling voor wie jouw berichten kan bekijken"
 
-#: ../../include/items.php:1144
-msgid "Visible to all connections."
-msgstr "Voor alle connecties zichtbaar."
+#: ../../include/PermissionDescription.php:162
+msgid ""
+"This is your default setting for who can view your default channel profile"
+msgstr "Dit is de standaard privacy-instelling voor wie jouw standaardprofiel kan bekijken"
 
-#: ../../include/items.php:1146
-msgid "Visible to approved connections."
-msgstr "Voor alle geaccepteerde connecties zichtbaar."
+#: ../../include/PermissionDescription.php:163
+msgid "This is your default setting for who can view your connections"
+msgstr "Dit is de standaard privacy-instelling voor wie een lijst met jouw connecties kan bekijken"
 
-#: ../../include/items.php:1148
-msgid "Visible to specific connections."
-msgstr "Voor specifieke connecties zichtbaar."
+#: ../../include/PermissionDescription.php:164
+msgid ""
+"This is your default setting for who can view your file storage and photos"
+msgstr "Dit is de standaard privacy-instelling voor wie jouw bestanden en foto's kan bekijken"
 
-#: ../../include/items.php:3910
-msgid "Privacy group is empty."
-msgstr "Privacygroep is leeg"
+#: ../../include/PermissionDescription.php:165
+msgid "This is your default setting for the audience of your webpages"
+msgstr "Dit is de standaard privacy-instelling voor wie jouw webpagina's kan bekijken"
 
-#: ../../include/items.php:3917
+#: ../../include/activities.php:41
+msgid " and "
+msgstr " en "
+
+#: ../../include/activities.php:49
+msgid "public profile"
+msgstr "openbaar profiel"
+
+#: ../../include/activities.php:58
 #, php-format
-msgid "Privacy group: %s"
-msgstr "Privacygroep: %s"
+msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
+msgstr "%1$s veranderde %2$s naar &ldquo;%3$s&rdquo;"
 
-#: ../../include/items.php:3929
-msgid "Connection not found."
-msgstr "Connectie niet gevonden."
+#: ../../include/activities.php:59
+#, php-format
+msgid "Visit %1$s's %2$s"
+msgstr "Bezoek het %2$s van %1$s"
 
-#: ../../include/items.php:4278
-msgid "profile photo"
-msgstr "profielfoto"
+#: ../../include/activities.php:62
+#, php-format
+msgid "%1$s has an updated %2$s, changing %3$s."
+msgstr "%1$s heeft een aangepaste %2$s, %3$s veranderd."
+
+#: ../../include/dir_fns.php:141
+msgid "Directory Options"
+msgstr "Opties kanalengids"
+
+#: ../../include/dir_fns.php:143
+msgid "Safe Mode"
+msgstr "Veilig zoeken"
+
+#: ../../include/dir_fns.php:144
+msgid "Public Forums Only"
+msgstr "Alleen openbare forums"
+
+#: ../../include/dir_fns.php:145
+msgid "This Website Only"
+msgstr "Alleen deze hub"
 
 #: ../../include/page_widgets.php:6
 msgid "New Page"
@@ -9590,99 +9620,14 @@ msgstr "Speciaal - Groepsopslag"
 msgid "Custom/Expert Mode"
 msgstr "Expertmodus/handmatig aanpassen"
 
-#: ../../include/apps.php:155
-msgid "Site Admin"
-msgstr "Hubbeheerder"
-
-#: ../../include/apps.php:156
-msgid "Bug Report"
-msgstr "Bugrapport"
-
-#: ../../include/apps.php:157
-msgid "View Bookmarks"
-msgstr "Bladwijzers bekijken"
-
-#: ../../include/apps.php:158
-msgid "My Chatrooms"
-msgstr "Mijn chatkanalen"
-
-#: ../../include/apps.php:160
-msgid "Firefox Share"
-msgstr "Firefox Share"
-
-#: ../../include/apps.php:161
-msgid "Remote Diagnostics"
-msgstr "Diagnose op afstand"
-
-#: ../../include/apps.php:180
-msgid "Probe"
-msgstr "Onderzoeken"
-
-#: ../../include/apps.php:181
-msgid "Suggest"
-msgstr "Voorstellen"
-
-#: ../../include/apps.php:182
-msgid "Random Channel"
-msgstr "Willekeurig kanaal"
-
-#: ../../include/apps.php:183
-msgid "Invite"
-msgstr "Uitnodigen "
-
-#: ../../include/apps.php:186
-msgid "Post"
-msgstr "Bericht"
-
-#: ../../include/apps.php:289
-msgid "Purchase"
-msgstr "Aanschaffen"
-
 #: ../../include/bb2diaspora.php:398
 msgid "Attachments:"
 msgstr "Bijlagen:"
 
-#: ../../include/bb2diaspora.php:489
+#: ../../include/bb2diaspora.php:487
 msgid "$Projectname event notification:"
 msgstr "Notificatie $Projectname-gebeurtenis:"
 
-#: ../../include/acl_selectors.php:273
-msgid "Add others"
-msgstr "Meer toevoegen"
-
-#: ../../include/acl_selectors.php:276
-msgid "Who can see this?"
-msgstr "Wie kan dit zien?"
-
-#: ../../include/acl_selectors.php:277
-msgid "Custom selection"
-msgstr "Handmatige selectie"
-
-#: ../../include/acl_selectors.php:278
-msgid ""
-"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit"
-" the scope of \"Show\"."
-msgstr "Kies \"Tonen\" om weergave toe te staan.  Met \"Niet tonen\" kan je uitzonderingen maken op \"Tonen\"."
-
-#: ../../include/acl_selectors.php:279
-msgid "Show"
-msgstr "Tonen"
-
-#: ../../include/acl_selectors.php:280
-msgid "Don't show"
-msgstr "Niet tonen"
-
-#: ../../include/acl_selectors.php:286
-msgid "Other networks and post services"
-msgstr "Andere netwerken en diensten"
-
-#: ../../include/acl_selectors.php:316
-#, php-format
-msgid ""
-"Post permissions %s cannot be changed %s after a post is shared.</br />These"
-" permissions set who is allowed to view the post."
-msgstr "Permissies van berichten %s zijn niet meer te veranderen %s nadat een bericht is gedeeld.</br />Met deze permissies bepaal je wie het bericht kan zien."
-
 #: ../../view/theme/redbasic/php/config.php:82
 msgid "Focus (Hubzilla default)"
 msgstr "Focus (Hubzilla-standaard)"
@@ -9819,62 +9764,62 @@ msgstr "Grootte profielfoto's van berichten instellen"
 msgid "Set size of followup author photos"
 msgstr "Grootte profielfoto's van reacties instellen"
 
-#: ../../boot.php:1089
+#: ../../boot.php:1161
 #, php-format
 msgctxt "opensearch"
 msgid "Search %1$s (%2$s)"
 msgstr "Zoek %1$s (%2$s)"
 
-#: ../../boot.php:1089
+#: ../../boot.php:1161
 msgctxt "opensearch"
 msgid "$Projectname"
 msgstr "$Projectname"
 
-#: ../../boot.php:1406
+#: ../../boot.php:1473
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "Update %s mislukt. Zie foutenlogboek."
 
-#: ../../boot.php:1409
+#: ../../boot.php:1476
 #, php-format
 msgid "Update Error at %s"
 msgstr "Update-fout op %s"
 
-#: ../../boot.php:1610
+#: ../../boot.php:1676
 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:1632
+#: ../../boot.php:1698
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: ../../boot.php:1633
+#: ../../boot.php:1699
 msgid "Remember me"
 msgstr "Aangemeld blijven"
 
-#: ../../boot.php:1636
+#: ../../boot.php:1702
 msgid "Forgot your password?"
 msgstr "Wachtwoord vergeten?"
 
-#: ../../boot.php:2205
+#: ../../boot.php:2268
 msgid "toggle mobile"
 msgstr "mobiele weergave omschakelen"
 
-#: ../../boot.php:2358
+#: ../../boot.php:2417
 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:2361
+#: ../../boot.php:2420
 #, php-format
 msgid "[hubzilla] Website SSL error for %s"
 msgstr "[hubzilla] Probleem met SSL-certificaat voor %s"
 
-#: ../../boot.php:2398
+#: ../../boot.php:2461
 msgid "Cron/Scheduled tasks not running."
 msgstr "Cron is niet actief"
 
-#: ../../boot.php:2402
+#: ../../boot.php:2465
 #, php-format
 msgid "[hubzilla] Cron tasks not running on %s"
 msgstr "[hubzilla] Cron-taken zijn niet actief op %s"
diff --git a/view/nl/hstrings.php b/view/nl/hstrings.php
index 4836574eb..85bd9f88d 100644
--- a/view/nl/hstrings.php
+++ b/view/nl/hstrings.php
@@ -32,6 +32,7 @@ App::$strings["Upload file"] = "Bestand uploaden";
 App::$strings["Permission denied."] = "Toegang geweigerd.";
 App::$strings["Not Found"] = "Niet gevonden";
 App::$strings["Page not found."] = "Pagina niet gevonden.";
+App::$strings["Permission denied"] = "Toegang geweigerd";
 App::$strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "Authenticatie op afstand geblokkeerd. Je bent lokaal op deze hub ingelogd. Uitloggen en opnieuw proberen.";
 App::$strings["Welcome %s. Remote authentication successful."] = "Welkom %s. Authenticatie op afstand geslaagd.";
 App::$strings["Requested profile is not available."] = "Opgevraagd profiel is niet beschikbaar";
@@ -522,7 +523,6 @@ App::$strings["Oldest to Newest"] = "Oud naar nieuw";
 App::$strings["No entries (some entries may be hidden)."] = "Niets gevonden (sommige kanalen kunnen verborgen zijn).";
 App::$strings["This site is not a directory server"] = "Deze hub is geen kanalengidshub (directoryserver)";
 App::$strings["This directory server requires an access token"] = "Deze kanalengidshub (directoryserver) heeft een toegangs-token nodig";
-App::$strings["Permission denied"] = "Toegang geweigerd";
 App::$strings["Invalid message"] = "Ongeldig bericht";
 App::$strings["no results"] = "geen resultaten";
 App::$strings["Delivery report for %1\$s"] = "Afleveringsrapport voor %1\$s";
@@ -595,10 +595,6 @@ App::$strings["Share this file"] = "Dit bestand delen";
 App::$strings["Show URL to this file"] = "Toon URL van dit bestand";
 App::$strings["Notify your contacts about this file"] = "Jouw connecties over dit bestand berichten";
 App::$strings["Channel added."] = "Kanaal toegevoegd.";
-App::$strings["Contact not found."] = "Contact niet gevonden";
-App::$strings["Friend suggestion sent."] = "Kanaalvoorstel verzonden.";
-App::$strings["Suggest Friends"] = "Kanalen voorstellen";
-App::$strings["Suggest a friend for %s"] = "Stel een kanaal voor aan %s";
 App::$strings["Privacy group created."] = "Privacygroep aangemaakt";
 App::$strings["Could not create privacy group."] = "Kon privacygroep niet aanmaken";
 App::$strings["Privacy group not found."] = "Privacygroep niet gevonden";
@@ -1036,6 +1032,7 @@ App::$strings["The listed hubs allow public registration for the \$Projectname n
 App::$strings["Hub URL"] = "Hub-URL";
 App::$strings["Access Type"] = "Toegangs-<br/>&nbsp;type";
 App::$strings["Registration Policy"] = "Registratie-<br/>&nbsp;beleid";
+App::$strings["Stats"] = "Stats";
 App::$strings["Software"] = "Software";
 App::$strings["Ratings"] = "Beoordelingen";
 App::$strings["Rate"] = "Beoordeel";
@@ -1273,7 +1270,7 @@ App::$strings["Please select a default timezone for your website"] = "Please sel
 App::$strings["Site settings"] = "Hub settings";
 App::$strings["Enable \$Projectname <strong>advanced</strong> features?"] = "Enable \$Projectname <strong>advanced</strong> features?";
 App::$strings["Some advanced features, while useful - may be best suited for technically proficient audiences"] = "Some advanced features, while useful - may be best suited for technically proficient audiences";
-App::$strings["PHP version 5.4 or greater is required."] = "PHP version 5.4 or greater is required.";
+App::$strings["PHP version 5.5 or greater is required."] = "PHP version 5.5 or greater is required.";
 App::$strings["PHP version"] = "PHP version";
 App::$strings["Could not find a command line version of PHP in the web server PATH."] = "Could not find a command line version of PHP in the web server PATH.";
 App::$strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron."] = "If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron.";
@@ -1313,7 +1310,7 @@ App::$strings["At the end of this procedure, we will give you a text to save in
 App::$strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions."] = "You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions.";
 App::$strings[".htconfig.php is writable"] = ".htconfig.php is writable";
 App::$strings["Red uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Red uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering.";
-App::$strings["In order to store these compiled templates, the web server needs to have write access to the directory %s under the Red top level folder."] = "In order to store these compiled templates, the web server needs to have write access to the directory %s under the Red top level folder.";
+App::$strings["In order to store these compiled templates, the web server needs to have write access to the directory %s under the top level web folder."] = "In order to store these compiled templates, the web server needs to have write access to the directory %s under the top level web folder.";
 App::$strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder.";
 App::$strings["Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains."] = "Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains.";
 App::$strings["%s is writable"] = "%s is writable";
@@ -1409,14 +1406,272 @@ App::$strings["Page Link"] = "Paginalink";
 App::$strings["Page Title"] = "Paginatitel";
 App::$strings["Xchan Lookup"] = "Xchan opzoeken";
 App::$strings["Lookup xchan beginning with (or webbie): "] = "Zoek een xchan (of webbie) die begint met:";
+App::$strings["Site Admin"] = "Hubbeheerder";
+App::$strings["Bug Report"] = "Bugrapport";
+App::$strings["View Bookmarks"] = "Bladwijzers bekijken";
+App::$strings["My Chatrooms"] = "Mijn chatkanalen";
+App::$strings["Firefox Share"] = "Firefox Share";
+App::$strings["Remote Diagnostics"] = "Diagnose op afstand";
+App::$strings["Suggest Channels"] = "Kanalen voorstellen";
+App::$strings["Login"] = "Inloggen";
+App::$strings["Grid"] = "Grid";
+App::$strings["Channel Home"] = "Jouw kanaal";
+App::$strings["Events"] = "Agenda";
+App::$strings["Directory"] = "Kanalengids";
+App::$strings["Mail"] = "Privéberichten";
+App::$strings["Chat"] = "Chatten";
+App::$strings["Probe"] = "Onderzoeken";
+App::$strings["Suggest"] = "Voorstellen";
+App::$strings["Random Channel"] = "Willekeurig kanaal";
+App::$strings["Invite"] = "Uitnodigen ";
+App::$strings["Features"] = "Extra functies";
+App::$strings["Post"] = "Bericht";
+App::$strings["Purchase"] = "Aanschaffen";
+App::$strings["Missing room name"] = "Naam chatkanaal ontbreekt";
+App::$strings["Duplicate room name"] = "Naam chatkanaal bestaat al";
+App::$strings["Invalid room specifier."] = "Ongeldige omschrijving chatkanaal";
+App::$strings["Room not found."] = "Chatkanaal niet gevonden";
+App::$strings["Room is full"] = "Chatkanaal is vol";
+App::$strings["Private Message"] = "Niet voor iedereen zichtbaar";
+App::$strings["Select"] = "Kies";
+App::$strings["Save to Folder"] = "In map opslaan";
+App::$strings["I will attend"] = "Aanwezig";
+App::$strings["I will not attend"] = "Niet aanwezig";
+App::$strings["I might attend"] = "Mogelijk aanwezig";
+App::$strings["I agree"] = "Eens";
+App::$strings["I disagree"] = "Oneens";
+App::$strings["I abstain"] = "Onthouding";
+App::$strings["Add Star"] = "Ster toevoegen";
+App::$strings["Remove Star"] = "Ster verwijderen";
+App::$strings["Toggle Star Status"] = "Ster toevoegen of verwijderen";
+App::$strings["starred"] = "met ster";
+App::$strings["Message signature validated"] = "Berichtkenmerk gevalideerd";
+App::$strings["Message signature incorrect"] = "Berichtkenmerk onjuist";
+App::$strings["Add Tag"] = "Tag toevoegen";
+App::$strings["like"] = "vind dit leuk";
+App::$strings["dislike"] = "vind dit niet leuk";
+App::$strings["Share This"] = "Delen";
+App::$strings["share"] = "delen";
+App::$strings["Delivery Report"] = "Afleveringsrapport";
+App::$strings["%d comment"] = array(
+	0 => "%d reactie",
+	1 => "%d reacties weergeven",
+);
+App::$strings["View %s's profile - %s"] = "Profiel van %s bekijken - %s";
+App::$strings["to"] = "aan";
+App::$strings["via"] = "via";
+App::$strings["Wall-to-Wall"] = "Kanaal-naar-kanaal";
+App::$strings["via Wall-To-Wall:"] = "via kanaal-naar-kanaal";
+App::$strings["from %s"] = "van %s";
+App::$strings["last edited: %s"] = "laatst bewerkt: %s";
+App::$strings["Expires: %s"] = "Verloopt: %s";
+App::$strings["Save Bookmarks"] = "Bladwijzers opslaan";
+App::$strings["Add to Calendar"] = "Aan agenda toevoegen";
+App::$strings["Mark all seen"] = "Markeer alles als bekeken";
+App::$strings["[+] show all"] = "[+] alle";
+App::$strings["Bold"] = "Vet";
+App::$strings["Italic"] = "Cursief";
+App::$strings["Underline"] = "Onderstrepen";
+App::$strings["Quote"] = "Citeren";
+App::$strings["Code"] = "Broncode";
+App::$strings["Image"] = "Afbeelding";
+App::$strings["Insert Link"] = "Link invoegen";
+App::$strings["Video"] = "Video";
+App::$strings["\$Projectname Notification"] = "\$Projectname-notificatie";
+App::$strings["\$projectname"] = "\$projectname";
+App::$strings["Thank You,"] = "Bedankt,";
+App::$strings["%s Administrator"] = "Beheerder %s";
+App::$strings["%s <!item_type!>"] = "%s <!item_type!>";
+App::$strings["[Hubzilla:Notify] New mail received at %s"] = "[Hubzilla:Notificatie] Nieuw privébericht ontvangen op %s";
+App::$strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s zond jou een nieuw privébericht om %3\$s.";
+App::$strings["%1\$s sent you %2\$s."] = "%1\$s zond jou %2\$s.";
+App::$strings["a private message"] = "een privébericht";
+App::$strings["Please visit %s to view and/or reply to your private messages."] = "Bezoek %s om je privéberichten te bekijken en/of er op te reageren.";
+App::$strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s gaf een reactie op [zrl=%3\$s]een %4\$s[/zrl]";
+App::$strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s gaf een reactie op [zrl=%3\$s]een %5\$s van %4\$s[/zrl]";
+App::$strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s gaf een reactie op [zrl=%3\$s]jouw %4\$s[/zrl]";
+App::$strings["[Hubzilla:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Hubzilla:Notificatie] Reactie op conversatie #%1\$d door %2\$s";
+App::$strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s gaf een reactie op een bericht/conversatie die jij volgt.";
+App::$strings["Please visit %s to view and/or reply to the conversation."] = "Bezoek %s om de conversatie te bekijken en/of er op te reageren.";
+App::$strings["[Hubzilla:Notify] %s posted to your profile wall"] = "[Hubzilla:Notificatie] %s heeft een bericht op jouw kanaal geplaatst";
+App::$strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = "%1\$s, %2\$s heeft om %3\$s een bericht op jouw kanaal geplaatst";
+App::$strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = "%1\$s, %2\$s heeft een bericht op [zrl=%3\$s]jouw kanaal[/zrl] geplaatst";
+App::$strings["[Hubzilla:Notify] %s tagged you"] = "[Hubzilla:Notificatie] %s heeft je genoemd";
+App::$strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, %2\$s noemde jou op %3\$s";
+App::$strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "%1\$s, %2\$s [zrl=%3\$s]noemde jou[/zrl].";
+App::$strings["[Hubzilla:Notify] %1\$s poked you"] = "[Hubzilla:Notificatie] %1\$s heeft je aangestoten";
+App::$strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s heeft je aangestoten op %3\$s";
+App::$strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s, %2\$s [zrl=%2\$s]heeft je aangestoten[/zrl].";
+App::$strings["[Hubzilla:Notify] %s tagged your post"] = "[Hubzilla:Notificatie] %s heeft jouw bericht getagd";
+App::$strings["%1\$s, %2\$s tagged your post at %3\$s"] = "%1\$s, %2\$s heeft jouw bericht om %3\$s getagd";
+App::$strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "%1\$s, %2\$s heeft [zrl=%3\$s]jouw bericht[/zrl] getagd";
+App::$strings["[Hubzilla:Notify] Introduction received"] = "[Hubzilla:Notificatie] Connectieverzoek ontvangen";
+App::$strings["%1\$s, you've received an new connection request from '%2\$s' at %3\$s"] = "%1\$s, je hebt een nieuw connectieverzoek ontvangen van '%2\$s' op %3\$s";
+App::$strings["%1\$s, you've received [zrl=%2\$s]a new connection request[/zrl] from %3\$s."] = "%1\$s, je hebt een [zrl=%2\$s]nieuw connectieverzoek[/zrl] ontvangen van %3\$s.";
+App::$strings["You may visit their profile at %s"] = "Je kan het profiel bekijken op %s";
+App::$strings["Please visit %s to approve or reject the connection request."] = "Bezoek %s om het connectieverzoek te accepteren of af te wijzen.";
+App::$strings["[Hubzilla:Notify] Friend suggestion received"] = "[Hubzilla:Notificatie] Kanaalvoorstel ontvangen";
+App::$strings["%1\$s, you've received a friend suggestion from '%2\$s' at %3\$s"] = "%1\$s, je hebt een kanaalvoorstel ontvangen van '%2\$s' om %3\$s";
+App::$strings["%1\$s, you've received [zrl=%2\$s]a friend suggestion[/zrl] for %3\$s from %4\$s."] = "%1\$s, je hebt [zrl=%2\$s]een kanaalvoorstel[/zrl] ontvangen voor %3\$s van %4\$s.";
+App::$strings["Name:"] = "Naam:";
+App::$strings["Photo:"] = "Foto:";
+App::$strings["Please visit %s to approve or reject the suggestion."] = "Bezoek %s om het voorstel te accepteren of af te wijzen.";
+App::$strings["[Hubzilla:Notify]"] = "[Hubzilla:Notificatie]";
+App::$strings["created a new post"] = "maakte een nieuw bericht aan";
+App::$strings["commented on %s's post"] = "gaf een reactie op een bericht van %s";
 App::$strings["No username found in import file."] = "Geen gebruikersnaam in het importbestand gevonden.";
 App::$strings["Unable to create a unique channel address. Import failed."] = "Niet in staat om een uniek kanaaladres aan te maken. Importeren is mislukt.";
 App::$strings["Cannot locate DNS info for database server '%s'"] = "Kan DNS-informatie voor databaseserver '%s' niet vinden";
-App::$strings["Public Timeline"] = "Openbare tijdlijn";
-App::$strings["created a new post"] = "maakte een nieuw bericht aan";
-App::$strings["commented on %s's post"] = "gaf een reactie op een bericht van %s";
+App::$strings["view full size"] = "volledige grootte tonen";
+App::$strings["Administrator"] = "Beheerder";
+App::$strings["No Subject"] = "Geen onderwerp";
+App::$strings["Friendica"] = "Friendica";
+App::$strings["OStatus"] = "OStatus";
+App::$strings["GNU-Social"] = "GNU social";
+App::$strings["RSS/Atom"] = "RSS/Atom";
+App::$strings["Diaspora"] = "Diaspora";
+App::$strings["Facebook"] = "Facebook";
+App::$strings["Zot"] = "Zot";
+App::$strings["LinkedIn"] = "LinkedIn";
+App::$strings["XMPP/IM"] = "XMPP/IM";
+App::$strings["MySpace"] = "MySpace";
+App::$strings["Image exceeds website size limit of %lu bytes"] = "Afbeelding is groter dan op deze hub toegestane limiet van %lu bytes";
+App::$strings["Image file is empty."] = "Afbeeldingsbestand is leeg";
+App::$strings["Photo storage failed."] = "Foto kan niet worden opgeslagen";
+App::$strings["a new photo"] = "een nieuwe foto";
+App::$strings["__ctx:photo_upload__ %1\$s posted %2\$s to %3\$s"] = "%1\$s plaatste %2\$s op %3\$s";
+App::$strings["Photo Albums"] = "Fotoalbums";
+App::$strings["Upload New Photos"] = "Nieuwe foto's uploaden";
+App::$strings["New window"] = "Nieuw venster";
+App::$strings["Open the selected location in a different window or browser tab"] = "Open de geselecteerde locatie in een ander venster of tab";
+App::$strings["User '%s' deleted"] = "Account '%s' verwijderd";
 App::$strings["Embedded content"] = "Ingesloten (embedded) inhoud";
 App::$strings["Embedding disabled"] = "Insluiten (embedding) uitgeschakeld";
+App::$strings["%d invitation available"] = array(
+	0 => "%d uitnodiging beschikbaar",
+	1 => "%d uitnodigingen beschikbaar",
+);
+App::$strings["Find Channels"] = "Kanalen vinden";
+App::$strings["Enter name or interest"] = "Vul naam of interesse in";
+App::$strings["Connect/Follow"] = "Verbinden/volgen";
+App::$strings["Examples: Robert Morgenstein, Fishing"] = "Voorbeeld: Robert Morgenstein, vissen";
+App::$strings["Random Profile"] = "Willekeurig profiel";
+App::$strings["Invite Friends"] = "Vrienden uitnodigen";
+App::$strings["Advanced example: name=fred and country=iceland"] = "Geavanceerd voorbeeld (Engels): name=jan en country=nederland";
+App::$strings["Saved Folders"] = "Bewaarde mappen";
+App::$strings["Everything"] = "Alles";
+App::$strings["Categories"] = "Categorieën";
+App::$strings["%d connection in common"] = array(
+	0 => "%d gemeenschappelijke connectie",
+	1 => "%d gemeenschappelijke connecties",
+);
+App::$strings["show more"] = "meer connecties weergeven";
+App::$strings["%1\$s is now connected with %2\$s"] = "%1\$s is nu met %2\$s verbonden";
+App::$strings["%1\$s poked %2\$s"] = "%1\$s heeft %2\$s aangestoten";
+App::$strings["poked"] = "aangestoten";
+App::$strings["View %s's profile @ %s"] = "Bekijk het profiel van %s @ %s";
+App::$strings["Categories:"] = "Categorieën:";
+App::$strings["Filed under:"] = "Bewaard onder:";
+App::$strings["View in context"] = "In context bekijken";
+App::$strings["remove"] = "verwijderen";
+App::$strings["Loading..."] = "Aan het laden...";
+App::$strings["Delete Selected Items"] = "Verwijder de geselecteerde items";
+App::$strings["View Source"] = "Bron weergeven";
+App::$strings["Follow Thread"] = "Conversatie volgen";
+App::$strings["Unfollow Thread"] = "Conversatie niet meer volgen";
+App::$strings["Activity/Posts"] = "Activiteit/berichten connectie";
+App::$strings["Edit Connection"] = "Connectie bewerken";
+App::$strings["Message"] = "Bericht";
+App::$strings["%s likes this."] = "%s vindt dit leuk.";
+App::$strings["%s doesn't like this."] = "%s vindt dit niet leuk.";
+App::$strings["<span  %1\$s>%2\$d people</span> like this."] = array(
+	0 => "<span  %1\$s>%2\$d persoon</span> vindt dit leuk.",
+	1 => "<span  %1\$s>%2\$d personen</span> vinden dit leuk.",
+);
+App::$strings["<span  %1\$s>%2\$d people</span> don't like this."] = array(
+	0 => "<span  %1\$s>%2\$d persoon</span> vindt dit niet leuk.",
+	1 => "<span  %1\$s>%2\$d personen</span> vinden dit niet leuk.",
+);
+App::$strings["and"] = "en";
+App::$strings[", and %d other people"] = array(
+	0 => ", en %d ander persoon",
+	1 => ", en %d andere personen",
+);
+App::$strings["%s like this."] = "%s vinden dit leuk.";
+App::$strings["%s don't like this."] = "%s vinden dit niet leuk.";
+App::$strings["Set your location"] = "Locatie instellen";
+App::$strings["Clear browser location"] = "Locatie van webbrowser wissen";
+App::$strings["Tag term:"] = "Tag:";
+App::$strings["Where are you right now?"] = "Waar bevind je je op dit moment?";
+App::$strings["Page link name"] = "Linknaam pagina";
+App::$strings["Post as"] = "Bericht plaatsen als";
+App::$strings["Toggle voting"] = "Peiling in- of uitschakelen";
+App::$strings["Categories (optional, comma-separated list)"] = "Categorieën (optioneel, door komma's gescheiden lijst)";
+App::$strings["Set publish date"] = "Publicatiedatum instellen";
+App::$strings["OK"] = "OK";
+App::$strings["Discover"] = "Ontdekken";
+App::$strings["Imported public streams"] = "Openbare streams importeren";
+App::$strings["Commented Order"] = "Nieuwe reacties bovenaan";
+App::$strings["Sort by Comment Date"] = "Berichten met nieuwe reacties bovenaan";
+App::$strings["Posted Order"] = "Nieuwe berichten bovenaan";
+App::$strings["Sort by Post Date"] = "Nieuwe berichten bovenaan";
+App::$strings["Posts that mention or involve you"] = "Alleen berichten die jou vermelden of waar je op een andere manier bij betrokken bent";
+App::$strings["Activity Stream - by date"] = "Activiteitenstroom - volgens datum";
+App::$strings["Starred"] = "Met ster";
+App::$strings["Favourite Posts"] = "Favoriete berichten";
+App::$strings["Spam"] = "Spam";
+App::$strings["Posts flagged as SPAM"] = "Berichten gemarkeerd als SPAM";
+App::$strings["Status Messages and Posts"] = "Berichten in dit kanaal";
+App::$strings["About"] = "Over";
+App::$strings["Profile Details"] = "Profiel";
+App::$strings["Files and Storage"] = "Bestanden en opslagruimte";
+App::$strings["Chatrooms"] = "Chatkanalen";
+App::$strings["Bookmarks"] = "Bladwijzers";
+App::$strings["Saved Bookmarks"] = "Opgeslagen bladwijzers";
+App::$strings["Manage Webpages"] = "Webpagina's beheren";
+App::$strings["__ctx:noun__ Attending"] = array(
+	0 => "aanwezig",
+	1 => "aanwezig",
+);
+App::$strings["__ctx:noun__ Not Attending"] = array(
+	0 => "niet aanwezig",
+	1 => "niet aanwezig",
+);
+App::$strings["__ctx:noun__ Undecided"] = array(
+	0 => "nog niet beslist",
+	1 => "nog niet beslist",
+);
+App::$strings["__ctx:noun__ Agree"] = array(
+	0 => "eens",
+	1 => "eens",
+);
+App::$strings["__ctx:noun__ Disagree"] = array(
+	0 => "oneens",
+	1 => "oneens",
+);
+App::$strings["__ctx:noun__ Abstain"] = array(
+	0 => "onthouding",
+	1 => "onthoudingen",
+);
+App::$strings["l F d, Y \\@ g:i A"] = "l d F Y \\@ G:i";
+App::$strings["Starts:"] = "Start:";
+App::$strings["Finishes:"] = "Einde:";
+App::$strings["This event has been added to your calendar."] = "Dit evenement is aan jouw agenda toegevoegd.";
+App::$strings["Not specified"] = "Niet aangegeven";
+App::$strings["Needs Action"] = "Actie vereist";
+App::$strings["Completed"] = "Voltooid";
+App::$strings["In Process"] = "In behandeling";
+App::$strings["Cancelled"] = "Geannuleerd";
+App::$strings["No recipient provided."] = "Geen ontvanger opgegeven.";
+App::$strings["[no subject]"] = "[geen onderwerp]";
+App::$strings["Unable to determine sender."] = "Afzender kan niet bepaald worden.";
+App::$strings["Stored post could not be verified."] = "Opgeslagen bericht kon niet worden geverifieerd.";
+App::$strings["Frequently"] = "Regelmatig";
+App::$strings["Hourly"] = "Elk uur";
+App::$strings["Twice daily"] = "Twee keer per dag";
+App::$strings["Daily"] = "Dagelijks";
+App::$strings["Weekly"] = "Wekelijks";
+App::$strings["Monthly"] = "Maandelijks";
 App::$strings["Currently Male"] = "Momenteel man";
 App::$strings["Currently Female"] = "Momenteel vrouw";
 App::$strings["Mostly Male"] = "Voornamelijk man";
@@ -1472,111 +1727,31 @@ App::$strings["Uncertain"] = "Onzeker";
 App::$strings["It's complicated"] = "Het is ingewikkeld";
 App::$strings["Don't care"] = "Maakt mij niks uit";
 App::$strings["Ask me"] = "Vraag het me";
-App::$strings["New window"] = "Nieuw venster";
-App::$strings["Open the selected location in a different window or browser tab"] = "Open de geselecteerde locatie in een ander venster of tab";
-App::$strings["User '%s' deleted"] = "Account '%s' verwijderd";
-App::$strings["Invalid data packet"] = "Datapakket ongeldig";
-App::$strings["Unable to verify channel signature"] = "Kanaalkenmerk kon niet worden geverifieerd.  ";
-App::$strings["Unable to verify site signature for %s"] = "Hubkenmerk voor %s kon niet worden geverifieerd";
-App::$strings["invalid target signature"] = "ongeldig doelkenmerk";
-App::$strings["%d invitation available"] = array(
-	0 => "%d uitnodiging beschikbaar",
-	1 => "%d uitnodigingen beschikbaar",
-);
-App::$strings["Find Channels"] = "Kanalen vinden";
-App::$strings["Enter name or interest"] = "Vul naam of interesse in";
-App::$strings["Connect/Follow"] = "Verbinden/volgen";
-App::$strings["Examples: Robert Morgenstein, Fishing"] = "Voorbeeld: Robert Morgenstein, vissen";
-App::$strings["Random Profile"] = "Willekeurig profiel";
-App::$strings["Invite Friends"] = "Vrienden uitnodigen";
-App::$strings["Advanced example: name=fred and country=iceland"] = "Geavanceerd voorbeeld (Engels): name=jan en country=nederland";
-App::$strings["Saved Folders"] = "Bewaarde mappen";
-App::$strings["Everything"] = "Alles";
-App::$strings["Categories"] = "Categorieën";
-App::$strings["%d connection in common"] = array(
-	0 => "%d gemeenschappelijke connectie",
-	1 => "%d gemeenschappelijke connecties",
-);
-App::$strings["show more"] = "meer connecties weergeven";
-App::$strings["l F d, Y \\@ g:i A"] = "l d F Y \\@ G:i";
-App::$strings["Starts:"] = "Start:";
-App::$strings["Finishes:"] = "Einde:";
-App::$strings["This event has been added to your calendar."] = "Dit evenement is aan jouw agenda toegevoegd.";
-App::$strings["Not specified"] = "Niet aangegeven";
-App::$strings["Needs Action"] = "Actie vereist";
-App::$strings["Completed"] = "Voltooid";
-App::$strings["In Process"] = "In behandeling";
-App::$strings["Cancelled"] = "Geannuleerd";
-App::$strings["System"] = "Systeem";
-App::$strings["New App"] = "Nieuwe app";
-App::$strings["Suggestions"] = "Voorgestelde kanalen";
-App::$strings["See more..."] = "Meer...";
-App::$strings["You have %1$.0f of %2$.0f allowed connections."] = "Je hebt %1$.0f van de %2$.0f toegestane connecties.";
-App::$strings["Add New Connection"] = "Nieuwe connectie toevoegen";
-App::$strings["Enter channel address"] = "Vul kanaaladres in";
-App::$strings["Examples: bob@example.com, https://example.com/barbara"] = "Voorbeelden: bob@example.com, http://example.com/barbara";
-App::$strings["Notes"] = "Aantekeningen";
-App::$strings["Remove term"] = "Verwijder zoekterm";
-App::$strings["Saved Searches"] = "Opgeslagen zoekopdrachten";
-App::$strings["add"] = "toevoegen";
-App::$strings["Archives"] = "Archieven";
-App::$strings["Refresh"] = "Vernieuwen";
-App::$strings["Account settings"] = "Account";
-App::$strings["Channel settings"] = "Kanaal";
-App::$strings["Additional features"] = "Extra functies";
-App::$strings["Feature/Addon settings"] = "Plugin-instellingen";
-App::$strings["Display settings"] = "Weergave";
-App::$strings["Manage locations"] = "Locaties beheren";
-App::$strings["Export channel"] = "Kanaal exporteren";
-App::$strings["Connected apps"] = "Verbonden applicaties";
-App::$strings["Premium Channel Settings"] = "Instellingen premiumkanaal";
-App::$strings["Private Mail Menu"] = "Privéberichten";
-App::$strings["Combined View"] = "Gecombineerd postvak";
-App::$strings["Inbox"] = "Postvak IN";
-App::$strings["Outbox"] = "Postvak UIT";
-App::$strings["New Message"] = "Nieuw bericht";
-App::$strings["Conversations"] = "Conversaties";
-App::$strings["Received Messages"] = "Ontvangen berichten";
-App::$strings["Sent Messages"] = "Verzonden berichten";
-App::$strings["No messages."] = "Geen berichten";
-App::$strings["Delete conversation"] = "Verwijder conversatie";
-App::$strings["Events Menu"] = "Agenda-menu";
-App::$strings["Day View"] = "Dag tonen";
-App::$strings["Week View"] = "Week tonen";
-App::$strings["Month View"] = "Maand tonen";
-App::$strings["Events Tools"] = "Agenda-hulpmiddelen";
-App::$strings["Export Calendar"] = "Exporteren";
-App::$strings["Import Calendar"] = "Importeren";
-App::$strings["Chatrooms"] = "Chatkanalen";
-App::$strings["Overview"] = "Overzicht";
-App::$strings["Chat Members"] = "Chatleden";
-App::$strings["Bookmarked Chatrooms"] = "Bladwijzers van chatkanalen";
-App::$strings["Suggested Chatrooms"] = "Voorgestelde chatkanalen";
-App::$strings["photo/image"] = "foto/afbeelding";
-App::$strings["Click to show more"] = "Klik voor meer";
-App::$strings["Rating Tools"] = "Beoordelingen";
-App::$strings["Rate Me"] = "Beoordeel mij";
-App::$strings["View Ratings"] = "Bekijk beoordelingen";
-App::$strings["Forums"] = "Forums";
-App::$strings["Tasks"] = "Taken";
-App::$strings["Documentation"] = "Documentatie";
-App::$strings["Project/Site Information"] = "Project- en hub-informatie";
-App::$strings["For Members"] = "Voor leden";
-App::$strings["For Administrators"] = "Voor beheerders";
-App::$strings["For Developers"] = "Voor ontwikkelaars";
-App::$strings["Accounts"] = "Accounts";
-App::$strings["Member registrations waiting for confirmation"] = "Accounts die op goedkeuring wachten";
-App::$strings["Features"] = "Extra functies";
-App::$strings["Inspect queue"] = "Inspecteer berichtenwachtrij";
-App::$strings["DB updates"] = "Database-updates";
-App::$strings["Admin"] = "Beheer";
-App::$strings["Plugin Features"] = "Plugin-opties";
+App::$strings["Image/photo"] = "Afbeelding/foto";
+App::$strings["Encrypted content"] = "Versleutelde inhoud";
+App::$strings["Install %s element: "] = "Installeer %s-element: ";
+App::$strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Dit bericht heeft een te installeren %s-element, maar je hebt geen permissies om het op deze hub te installeren.";
+App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s schreef het volgende %2\$s %3\$s";
+App::$strings["Click to open/close"] = "Klik om te openen of te sluiten";
+App::$strings["spoiler"] = "spoiler";
+App::$strings["Different viewers will see this text differently"] = "Deze tekst wordt per persoon anders weergeven.";
+App::$strings["$1 wrote:"] = "$1 schreef:";
 App::$strings["%1\$s's bookmarks"] = "Bladwijzers van %1\$s";
-App::$strings["Missing room name"] = "Naam chatkanaal ontbreekt";
-App::$strings["Duplicate room name"] = "Naam chatkanaal bestaat al";
-App::$strings["Invalid room specifier."] = "Ongeldige omschrijving chatkanaal";
-App::$strings["Room not found."] = "Chatkanaal niet gevonden";
-App::$strings["Room is full"] = "Chatkanaal is vol";
+App::$strings["Item was not found."] = "Item niet gevonden";
+App::$strings["No source file."] = "Geen bronbestand.";
+App::$strings["Cannot locate file to replace"] = "Kan het te vervangen bestand niet vinden";
+App::$strings["Cannot locate file to revise/update"] = "Kan het bestand wat aangepast moet worden niet vinden";
+App::$strings["File exceeds size limit of %d"] = "Bestand is groter dan de toegelaten %d";
+App::$strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Je hebt jouw limiet van %1$.0f MB opslagruimte voor bijlagen bereikt.";
+App::$strings["File upload failed. Possible system limit or action terminated."] = "Uploaden van bestand mislukt. Mogelijk systeemlimiet bereikt of actie afgebroken.";
+App::$strings["Stored file could not be verified. Upload failed."] = "Opgeslagen bestand kon niet worden geverifieerd. Uploaden mislukt.";
+App::$strings["Path not available."] = "Pad niet beschikbaar.";
+App::$strings["Empty pathname"] = "Padnaam leeg";
+App::$strings["duplicate filename or path"] = "dubbele bestandsnaam of pad";
+App::$strings["Path not found."] = "Pad niet gevonden";
+App::$strings["mkdir failed."] = "directory aanmaken (mkdir) mislukt.";
+App::$strings["database storage failed."] = "opslag in database mislukt.";
+App::$strings["Empty path"] = "Ontbrekend bestandspad";
 App::$strings["Unable to obtain identity information from database"] = "Niet in staat om identiteitsinformatie uit de database te verkrijgen";
 App::$strings["Empty name"] = "Ontbrekende naam";
 App::$strings["Name too long"] = "Naam te lang";
@@ -1594,12 +1769,6 @@ App::$strings["Gender:"] = "Geslacht:";
 App::$strings["Status:"] = "Status:";
 App::$strings["Homepage:"] = "Homepagina:";
 App::$strings["Online Now"] = "Nu online";
-App::$strings["F d"] = "d F";
-App::$strings["Birthday Reminders"] = "Verjaardagsherinneringen";
-App::$strings["Birthdays this week:"] = "Verjaardagen deze week:";
-App::$strings["[No description]"] = "[Geen omschrijving]";
-App::$strings["Event Reminders"] = "Herinneringen";
-App::$strings["Events this week:"] = "Gebeurtenissen deze week:";
 App::$strings["Like this channel"] = "Vind dit kanaal leuk";
 App::$strings["j F, Y"] = "F j Y";
 App::$strings["j F"] = "F j";
@@ -1623,13 +1792,6 @@ App::$strings["Work/employment:"] = "Werk/beroep:";
 App::$strings["School/education:"] = "School/opleiding:";
 App::$strings["Like this thing"] = "Vind dit ding leuk";
 App::$strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "De beveiligings-token van het tekstvak was ongeldig. Dit is mogelijk het gevolg van dat er te lang (meer dan 3 uur) gewacht is om de tekst op te slaan. ";
-App::$strings["Image exceeds website size limit of %lu bytes"] = "Afbeelding is groter dan op deze hub toegestane limiet van %lu bytes";
-App::$strings["Image file is empty."] = "Afbeeldingsbestand is leeg";
-App::$strings["Photo storage failed."] = "Foto kan niet worden opgeslagen";
-App::$strings["a new photo"] = "een nieuwe foto";
-App::$strings["__ctx:photo_upload__ %1\$s posted %2\$s to %3\$s"] = "%1\$s plaatste %2\$s op %3\$s";
-App::$strings["Photo Albums"] = "Fotoalbums";
-App::$strings["Upload New Photos"] = "Nieuwe foto's uploaden";
 App::$strings["Logout"] = "Uitloggen";
 App::$strings["End this session"] = "Beëindig deze sessie";
 App::$strings["Home"] = "Home";
@@ -1639,12 +1801,9 @@ App::$strings["Manage/Edit profiles"] = "Beheer/wijzig profielen";
 App::$strings["Edit your profile"] = "Jouw profiel bewerken";
 App::$strings["Your photos"] = "Jouw foto's";
 App::$strings["Your files"] = "Jouw bestanden";
-App::$strings["Chat"] = "Chatten";
 App::$strings["Your chatrooms"] = "Jouw chatkanalen";
-App::$strings["Bookmarks"] = "Bladwijzers";
 App::$strings["Your bookmarks"] = "Jouw bladwijzers";
 App::$strings["Your webpages"] = "Jouw webpagina's";
-App::$strings["Login"] = "Inloggen";
 App::$strings["Sign in"] = "Inloggen";
 App::$strings["%s - click to logout"] = "%s - klik om uit te loggen";
 App::$strings["Remote authentication"] = "Authenticatie op afstand";
@@ -1654,64 +1813,96 @@ App::$strings["Create an account"] = "Maak een account aan";
 App::$strings["Help and documentation"] = "Hulp en documentatie";
 App::$strings["Applications, utilities, links, games"] = "Apps";
 App::$strings["Search site @name, #tag, ?docs, content"] = "Zoek een @kanaal, doorzoek inhoud hub met tekst en #tags, of doorzoek ?documentatie ";
-App::$strings["Directory"] = "Kanalengids";
 App::$strings["Channel Directory"] = "Kanalengids";
-App::$strings["Grid"] = "Grid";
 App::$strings["Your grid"] = "Jouw grid";
 App::$strings["Mark all grid notifications seen"] = "Markeer alle gridnotificaties als bekeken";
-App::$strings["Channel Home"] = "Jouw kanaal";
 App::$strings["Channel home"] = "Jouw kanaal";
 App::$strings["Mark all channel notifications seen"] = "Alle kanaalnotificaties als gelezen markeren";
 App::$strings["Notices"] = "Notificaties";
 App::$strings["Notifications"] = "Notificaties";
 App::$strings["See all notifications"] = "Alle notificaties weergeven";
-App::$strings["Mail"] = "Privéberichten";
 App::$strings["Private mail"] = "Privéberichten";
 App::$strings["See all private messages"] = "Alle privéberichten weergeven";
 App::$strings["Mark all private messages seen"] = "Markeer alle privéberichten als bekeken";
-App::$strings["Events"] = "Agenda";
+App::$strings["Inbox"] = "Postvak IN";
+App::$strings["Outbox"] = "Postvak UIT";
+App::$strings["New Message"] = "Nieuw bericht";
 App::$strings["Event Calendar"] = "Agenda";
 App::$strings["See all events"] = "Alle gebeurtenissen weergeven";
 App::$strings["Mark all events seen"] = "Markeer alle gebeurtenissen als bekeken";
 App::$strings["Manage Your Channels"] = "Beheer je kanalen";
 App::$strings["Account/Channel Settings"] = "Account-/kanaal-instellingen";
+App::$strings["Admin"] = "Beheer";
 App::$strings["Site Setup and Configuration"] = "Hub instellen en beheren";
-App::$strings["Loading..."] = "Aan het laden...";
 App::$strings["@name, #tag, ?doc, content"] = "@kanaal, #tag, inhoud, ?hulp";
 App::$strings["Please wait..."] = "Wachten aub...";
-App::$strings["Frequently"] = "Regelmatig";
-App::$strings["Hourly"] = "Elk uur";
-App::$strings["Twice daily"] = "Twee keer per dag";
-App::$strings["Daily"] = "Dagelijks";
-App::$strings["Weekly"] = "Wekelijks";
-App::$strings["Monthly"] = "Maandelijks";
-App::$strings["Friendica"] = "Friendica";
-App::$strings["OStatus"] = "OStatus";
-App::$strings["GNU-Social"] = "GNU social";
-App::$strings["RSS/Atom"] = "RSS/Atom";
-App::$strings["Diaspora"] = "Diaspora";
-App::$strings["Facebook"] = "Facebook";
-App::$strings["Zot"] = "Zot";
-App::$strings["LinkedIn"] = "LinkedIn";
-App::$strings["XMPP/IM"] = "XMPP/IM";
-App::$strings["MySpace"] = "MySpace";
-App::$strings["Logged out."] = "Uitgelogd.";
-App::$strings["Failed authentication"] = "Mislukte authenticatie";
-App::$strings["Item was not found."] = "Item niet gevonden";
-App::$strings["No source file."] = "Geen bronbestand.";
-App::$strings["Cannot locate file to replace"] = "Kan het te vervangen bestand niet vinden";
-App::$strings["Cannot locate file to revise/update"] = "Kan het bestand wat aangepast moet worden niet vinden";
-App::$strings["File exceeds size limit of %d"] = "Bestand is groter dan de toegelaten %d";
-App::$strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Je hebt jouw limiet van %1$.0f MB opslagruimte voor bijlagen bereikt.";
-App::$strings["File upload failed. Possible system limit or action terminated."] = "Uploaden van bestand mislukt. Mogelijk systeemlimiet bereikt of actie afgebroken.";
-App::$strings["Stored file could not be verified. Upload failed."] = "Opgeslagen bestand kon niet worden geverifieerd. Uploaden mislukt.";
-App::$strings["Path not available."] = "Pad niet beschikbaar.";
-App::$strings["Empty pathname"] = "Padnaam leeg";
-App::$strings["duplicate filename or path"] = "dubbele bestandsnaam of pad";
-App::$strings["Path not found."] = "Pad niet gevonden";
-App::$strings["mkdir failed."] = "directory aanmaken (mkdir) mislukt.";
-App::$strings["database storage failed."] = "opslag in database mislukt.";
-App::$strings["Empty path"] = "Ontbrekend bestandspad";
+App::$strings["System"] = "Systeem";
+App::$strings["New App"] = "Nieuwe app";
+App::$strings["Suggestions"] = "Voorgestelde kanalen";
+App::$strings["See more..."] = "Meer...";
+App::$strings["You have %1$.0f of %2$.0f allowed connections."] = "Je hebt %1$.0f van de %2$.0f toegestane connecties.";
+App::$strings["Add New Connection"] = "Nieuwe connectie toevoegen";
+App::$strings["Enter channel address"] = "Vul kanaaladres in";
+App::$strings["Examples: bob@example.com, https://example.com/barbara"] = "Voorbeelden: bob@example.com, http://example.com/barbara";
+App::$strings["Notes"] = "Aantekeningen";
+App::$strings["Remove term"] = "Verwijder zoekterm";
+App::$strings["Saved Searches"] = "Opgeslagen zoekopdrachten";
+App::$strings["add"] = "toevoegen";
+App::$strings["Archives"] = "Archieven";
+App::$strings["Refresh"] = "Vernieuwen";
+App::$strings["Account settings"] = "Account";
+App::$strings["Channel settings"] = "Kanaal";
+App::$strings["Additional features"] = "Extra functies";
+App::$strings["Feature/Addon settings"] = "Plugin-instellingen";
+App::$strings["Display settings"] = "Weergave";
+App::$strings["Manage locations"] = "Locaties beheren";
+App::$strings["Export channel"] = "Kanaal exporteren";
+App::$strings["Connected apps"] = "Verbonden applicaties";
+App::$strings["Premium Channel Settings"] = "Instellingen premiumkanaal";
+App::$strings["Private Mail Menu"] = "Privéberichten";
+App::$strings["Combined View"] = "Gecombineerd postvak";
+App::$strings["Conversations"] = "Conversaties";
+App::$strings["Received Messages"] = "Ontvangen berichten";
+App::$strings["Sent Messages"] = "Verzonden berichten";
+App::$strings["No messages."] = "Geen berichten";
+App::$strings["Delete conversation"] = "Verwijder conversatie";
+App::$strings["Events Menu"] = "Agenda-menu";
+App::$strings["Day View"] = "Dag tonen";
+App::$strings["Week View"] = "Week tonen";
+App::$strings["Month View"] = "Maand tonen";
+App::$strings["Events Tools"] = "Agenda-hulpmiddelen";
+App::$strings["Export Calendar"] = "Exporteren";
+App::$strings["Import Calendar"] = "Importeren";
+App::$strings["Overview"] = "Overzicht";
+App::$strings["Chat Members"] = "Chatleden";
+App::$strings["Bookmarked Chatrooms"] = "Bladwijzers van chatkanalen";
+App::$strings["Suggested Chatrooms"] = "Voorgestelde chatkanalen";
+App::$strings["photo/image"] = "foto/afbeelding";
+App::$strings["Click to show more"] = "Klik voor meer";
+App::$strings["Rating Tools"] = "Beoordelingen";
+App::$strings["Rate Me"] = "Beoordeel mij";
+App::$strings["View Ratings"] = "Bekijk beoordelingen";
+App::$strings["Forums"] = "Forums";
+App::$strings["Tasks"] = "Taken";
+App::$strings["Documentation"] = "Documentatie";
+App::$strings["Project/Site Information"] = "Project- en hub-informatie";
+App::$strings["For Members"] = "Voor leden";
+App::$strings["For Administrators"] = "Voor beheerders";
+App::$strings["For Developers"] = "Voor ontwikkelaars";
+App::$strings["Accounts"] = "Accounts";
+App::$strings["Member registrations waiting for confirmation"] = "Accounts die op goedkeuring wachten";
+App::$strings["Inspect queue"] = "Inspecteer berichtenwachtrij";
+App::$strings["DB updates"] = "Database-updates";
+App::$strings["Plugin Features"] = "Plugin-opties";
+App::$strings["Visible to your default audience"] = "Voor iedereen zichtbaar, mits niet anders ingesteld";
+App::$strings["Only me"] = "Alleen ik";
+App::$strings["Who can see this?"] = "Wie kan dit zien?";
+App::$strings["Custom selection"] = "Handmatige selectie";
+App::$strings["Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit the scope of \"Show\"."] = "Kies \"Tonen\" om weergave toe te staan.  Met \"Niet tonen\" kan je uitzonderingen maken op \"Tonen\".";
+App::$strings["Show"] = "Tonen";
+App::$strings["Don't show"] = "Niet tonen";
+App::$strings["Other networks and post services"] = "Andere netwerken en diensten";
+App::$strings["Post permissions %s cannot be changed %s after a post is shared.</br />These permissions set who is allowed to view the post."] = "Permissies van berichten %s zijn niet meer te veranderen %s nadat een bericht is gedeeld.</br />Met deze permissies bepaal je wie het bericht kan zien.";
 App::$strings["Birthday"] = "Verjaardag of geboortedatum";
 App::$strings["Age: "] = "Leeftijd:";
 App::$strings["YYYY-MM-DD or MM-DD"] = "JJJJ-MM-DD of MM-DD";
@@ -1748,100 +1939,26 @@ App::$strings["__ctx:relative_date__ second"] = array(
 );
 App::$strings["%1\$s's birthday"] = "Verjaardag van %1\$s";
 App::$strings["Happy Birthday %1\$s"] = "Gefeliciteerd met je verjaardag %1\$s";
-App::$strings["Directory Options"] = "Opties kanalengids";
-App::$strings["Safe Mode"] = "Veilig zoeken";
-App::$strings["Public Forums Only"] = "Alleen openbare forums";
-App::$strings["This Website Only"] = "Alleen deze hub";
-App::$strings["\$Projectname Notification"] = "\$Projectname-notificatie";
-App::$strings["\$projectname"] = "\$projectname";
-App::$strings["Thank You,"] = "Bedankt,";
-App::$strings["%s Administrator"] = "Beheerder %s";
-App::$strings["%s <!item_type!>"] = "%s <!item_type!>";
-App::$strings["[Hubzilla:Notify] New mail received at %s"] = "[Hubzilla:Notificatie] Nieuw privébericht ontvangen op %s";
-App::$strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s zond jou een nieuw privébericht om %3\$s.";
-App::$strings["%1\$s sent you %2\$s."] = "%1\$s zond jou %2\$s.";
-App::$strings["a private message"] = "een privébericht";
-App::$strings["Please visit %s to view and/or reply to your private messages."] = "Bezoek %s om je privéberichten te bekijken en/of er op te reageren.";
-App::$strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s gaf een reactie op [zrl=%3\$s]een %4\$s[/zrl]";
-App::$strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s gaf een reactie op [zrl=%3\$s]een %5\$s van %4\$s[/zrl]";
-App::$strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s gaf een reactie op [zrl=%3\$s]jouw %4\$s[/zrl]";
-App::$strings["[Hubzilla:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Hubzilla:Notificatie] Reactie op conversatie #%1\$d door %2\$s";
-App::$strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s gaf een reactie op een bericht/conversatie die jij volgt.";
-App::$strings["Please visit %s to view and/or reply to the conversation."] = "Bezoek %s om de conversatie te bekijken en/of er op te reageren.";
-App::$strings["[Hubzilla:Notify] %s posted to your profile wall"] = "[Hubzilla:Notificatie] %s heeft een bericht op jouw kanaal geplaatst";
-App::$strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = "%1\$s, %2\$s heeft om %3\$s een bericht op jouw kanaal geplaatst";
-App::$strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = "%1\$s, %2\$s heeft een bericht op [zrl=%3\$s]jouw kanaal[/zrl] geplaatst";
-App::$strings["[Hubzilla:Notify] %s tagged you"] = "[Hubzilla:Notificatie] %s heeft je genoemd";
-App::$strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, %2\$s noemde jou op %3\$s";
-App::$strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "%1\$s, %2\$s [zrl=%3\$s]noemde jou[/zrl].";
-App::$strings["[Hubzilla:Notify] %1\$s poked you"] = "[Hubzilla:Notificatie] %1\$s heeft je aangestoten";
-App::$strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s heeft je aangestoten op %3\$s";
-App::$strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s, %2\$s [zrl=%2\$s]heeft je aangestoten[/zrl].";
-App::$strings["[Hubzilla:Notify] %s tagged your post"] = "[Hubzilla:Notificatie] %s heeft jouw bericht getagd";
-App::$strings["%1\$s, %2\$s tagged your post at %3\$s"] = "%1\$s, %2\$s heeft jouw bericht om %3\$s getagd";
-App::$strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "%1\$s, %2\$s heeft [zrl=%3\$s]jouw bericht[/zrl] getagd";
-App::$strings["[Hubzilla:Notify] Introduction received"] = "[Hubzilla:Notificatie] Connectieverzoek ontvangen";
-App::$strings["%1\$s, you've received an new connection request from '%2\$s' at %3\$s"] = "%1\$s, je hebt een nieuw connectieverzoek ontvangen van '%2\$s' op %3\$s";
-App::$strings["%1\$s, you've received [zrl=%2\$s]a new connection request[/zrl] from %3\$s."] = "%1\$s, je hebt een [zrl=%2\$s]nieuw connectieverzoek[/zrl] ontvangen van %3\$s.";
-App::$strings["You may visit their profile at %s"] = "Je kan het profiel bekijken op %s";
-App::$strings["Please visit %s to approve or reject the connection request."] = "Bezoek %s om het connectieverzoek te accepteren of af te wijzen.";
-App::$strings["[Hubzilla:Notify] Friend suggestion received"] = "[Hubzilla:Notificatie] Kanaalvoorstel ontvangen";
-App::$strings["%1\$s, you've received a friend suggestion from '%2\$s' at %3\$s"] = "%1\$s, je hebt een kanaalvoorstel ontvangen van '%2\$s' om %3\$s";
-App::$strings["%1\$s, you've received [zrl=%2\$s]a friend suggestion[/zrl] for %3\$s from %4\$s."] = "%1\$s, je hebt [zrl=%2\$s]een kanaalvoorstel[/zrl] ontvangen voor %3\$s van %4\$s.";
-App::$strings["Name:"] = "Naam:";
-App::$strings["Photo:"] = "Foto:";
-App::$strings["Please visit %s to approve or reject the suggestion."] = "Bezoek %s om het voorstel te accepteren of af te wijzen.";
-App::$strings["[Hubzilla:Notify]"] = "[Hubzilla:Notificatie]";
-App::$strings["Private Message"] = "Niet voor iedereen zichtbaar";
-App::$strings["Select"] = "Kies";
-App::$strings["Save to Folder"] = "In map opslaan";
-App::$strings["I will attend"] = "Aanwezig";
-App::$strings["I will not attend"] = "Niet aanwezig";
-App::$strings["I might attend"] = "Mogelijk aanwezig";
-App::$strings["I agree"] = "Eens";
-App::$strings["I disagree"] = "Oneens";
-App::$strings["I abstain"] = "Onthouding";
-App::$strings["Add Star"] = "Ster toevoegen";
-App::$strings["Remove Star"] = "Ster verwijderen";
-App::$strings["Toggle Star Status"] = "Ster toevoegen of verwijderen";
-App::$strings["starred"] = "met ster";
-App::$strings["Message signature validated"] = "Berichtkenmerk gevalideerd";
-App::$strings["Message signature incorrect"] = "Berichtkenmerk onjuist";
-App::$strings["Add Tag"] = "Tag toevoegen";
-App::$strings["like"] = "vind dit leuk";
-App::$strings["dislike"] = "vind dit niet leuk";
-App::$strings["Share This"] = "Delen";
-App::$strings["share"] = "delen";
-App::$strings["Delivery Report"] = "Afleveringsrapport";
-App::$strings["%d comment"] = array(
-	0 => "%d reactie",
-	1 => "%d reacties weergeven",
-);
-App::$strings["View %s's profile - %s"] = "Profiel van %s bekijken - %s";
-App::$strings["to"] = "aan";
-App::$strings["via"] = "via";
-App::$strings["Wall-to-Wall"] = "Kanaal-naar-kanaal";
-App::$strings["via Wall-To-Wall:"] = "via kanaal-naar-kanaal";
-App::$strings["from %s"] = "van %s";
-App::$strings["last edited: %s"] = "laatst bewerkt: %s";
-App::$strings["Expires: %s"] = "Verloopt: %s";
-App::$strings["Save Bookmarks"] = "Bladwijzers opslaan";
-App::$strings["Add to Calendar"] = "Aan agenda toevoegen";
-App::$strings["Mark all seen"] = "Markeer alles als bekeken";
-App::$strings["[+] show all"] = "[+] alle";
-App::$strings["Bold"] = "Vet";
-App::$strings["Italic"] = "Cursief";
-App::$strings["Underline"] = "Onderstrepen";
-App::$strings["Quote"] = "Citeren";
-App::$strings["Code"] = "Broncode";
-App::$strings["Image"] = "Afbeelding";
-App::$strings["Insert Link"] = "Link invoegen";
-App::$strings["Video"] = "Video";
-App::$strings[" and "] = " en ";
-App::$strings["public profile"] = "openbaar profiel";
-App::$strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s veranderde %2\$s naar &ldquo;%3\$s&rdquo;";
-App::$strings["Visit %1\$s's %2\$s"] = "Bezoek het %2\$s van %1\$s";
-App::$strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s heeft een aangepaste %2\$s, %3\$s veranderd.";
+App::$strings["Not a valid email address"] = "Geen geldig e-mailadres";
+App::$strings["Your email domain is not among those allowed on this site"] = "Jouw e-maildomein is op deze hub niet toegestaan";
+App::$strings["Your email address is already registered at this site."] = "Jouw e-mailadres is al op deze hub geregistreerd.";
+App::$strings["An invitation is required."] = "Een uitnodiging is vereist";
+App::$strings["Invitation could not be verified."] = "Uitnodiging kon niet geverifieerd worden";
+App::$strings["Please enter the required information."] = "Vul de vereiste informatie in.";
+App::$strings["Failed to store account information."] = "Account-informatie kon niet opgeslagen worden.";
+App::$strings["Registration confirmation for %s"] = "Registratiebevestiging voor %s";
+App::$strings["Registration request at %s"] = "Registratiebevestiging voor %s";
+App::$strings["your registration password"] = "jouw registratiewachtwoord";
+App::$strings["Registration details for %s"] = "Registratiegegevens voor %s";
+App::$strings["Account approved."] = "Account goedgekeurd";
+App::$strings["Registration revoked for %s"] = "Registratie ingetrokken voor %s";
+App::$strings["Account verified. Please login."] = "Account is geverifieerd. Je kan inloggen.";
+App::$strings["Click here to upgrade."] = "Klik hier om te upgraden.";
+App::$strings["This action exceeds the limits set by your subscription plan."] = "Deze handeling overschrijdt de beperkingen die voor jouw abonnement gelden.";
+App::$strings["This action is not available under your subscription plan."] = "Deze handeling is niet mogelijk met jouw abonnement.";
+App::$strings["Public Timeline"] = "Openbare tijdlijn";
+App::$strings["Logged out."] = "Uitgelogd.";
+App::$strings["Failed authentication"] = "Mislukte authenticatie";
 App::$strings["Channel is blocked on this site."] = "Kanaal is op deze hub geblokkeerd.";
 App::$strings["Channel location missing."] = "Ontbrekende kanaallocatie.";
 App::$strings["Response from remote channel was incomplete."] = "Antwoord van het kanaal op afstand was niet volledig.";
@@ -1849,6 +1966,21 @@ App::$strings["Channel was deleted and no longer exists."] = "Kanaal is verwijde
 App::$strings["Protocol disabled."] = "Protocol uitgeschakeld.";
 App::$strings["Channel discovery failed."] = "Kanaal ontdekken mislukt.";
 App::$strings["Cannot connect to yourself."] = "Kan niet met jezelf verbinden";
+App::$strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "Kan geen dubbele kanaal-identificator op deze hub aanmaken. Importeren mislukt.";
+App::$strings["Channel clone failed. Import failed."] = "Het klonen van het kanaal is mislukt. Importeren mislukt.";
+App::$strings["(Unknown)"] = "(Onbekend)";
+App::$strings["Visible to anybody on the internet."] = "Voor iedereen op het internet zichtbaar.";
+App::$strings["Visible to you only."] = "Alleen voor jou zichtbaar.";
+App::$strings["Visible to anybody in this network."] = "Voor iedereen in dit netwerk zichtbaar.";
+App::$strings["Visible to anybody authenticated."] = "Voor iedereen die geauthenticeerd is zichtbaar.";
+App::$strings["Visible to anybody on %s."] = "Voor iedereen op %s zichtbaar.";
+App::$strings["Visible to all connections."] = "Voor alle connecties zichtbaar.";
+App::$strings["Visible to approved connections."] = "Voor alle geaccepteerde connecties zichtbaar.";
+App::$strings["Visible to specific connections."] = "Voor specifieke connecties zichtbaar.";
+App::$strings["Privacy group is empty."] = "Privacygroep is leeg";
+App::$strings["Privacy group: %s"] = "Privacygroep: %s";
+App::$strings["Connection not found."] = "Connectie niet gevonden.";
+App::$strings["profile photo"] = "profielfoto";
 App::$strings["General Features"] = "Algemene functies";
 App::$strings["Content Expiration"] = "Inhoud laten verlopen";
 App::$strings["Remove posts/comments and/or private messages at a future time"] = "Berichten, reacties en/of privéberichten na een bepaalde tijd verwijderen";
@@ -1902,7 +2034,6 @@ App::$strings["Affinity Tool"] = "Verwantschapsfilter";
 App::$strings["Filter stream activity by depth of relationships"] = "Filter wat je in jouw grid ziet op hoe goed je iemand kent of mag";
 App::$strings["Connection Filtering"] = "Berichtenfilters";
 App::$strings["Filter incoming posts from connections based on keywords/content"] = "Filter binnenkomende berichten van connecties aan de hand van trefwoorden en taal";
-App::$strings["Suggest Channels"] = "Kanalen voorstellen";
 App::$strings["Show channel suggestions"] = "Voor jou mogelijk interessante kanalen voorstellen";
 App::$strings["Post/Comment Tools"] = "Bericht- en reactiehulpmiddelen";
 App::$strings["Community Tagging"] = "Taggen door anderen";
@@ -1916,112 +2047,12 @@ App::$strings["Star Posts"] = "Geef berichten een ster";
 App::$strings["Ability to mark special posts with a star indicator"] = "Mogelijkheid om speciale berichten met een ster te markeren";
 App::$strings["Tag Cloud"] = "Tagwolk";
 App::$strings["Provide a personal tag cloud on your channel page"] = "Zorgt voor een persoonlijke wolk met tags op jouw kanaalpagina";
-App::$strings["No recipient provided."] = "Geen ontvanger opgegeven.";
-App::$strings["[no subject]"] = "[geen onderwerp]";
-App::$strings["Unable to determine sender."] = "Afzender kan niet bepaald worden.";
-App::$strings["Stored post could not be verified."] = "Opgeslagen bericht kon niet worden geverifieerd.";
-App::$strings["view full size"] = "volledige grootte tonen";
-App::$strings["Administrator"] = "Beheerder";
-App::$strings["No Subject"] = "Geen onderwerp";
 App::$strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Een verwijderde collectie met deze naam is gereactiveerd. Bestaande itemrechten  <strong>kunnen</strong> van toepassing zijn op deze collectie en toekomstige leden. Wanneer je dit niet zo bedoeld hebt, moet je een nieuwe collectie met een andere naam aanmaken.";
 App::$strings["Add new connections to this privacy group"] = "Voeg nieuwe connecties aan deze privacygroep toe";
 App::$strings["edit"] = "bewerken";
 App::$strings["Edit group"] = "Privacygroep bewerken";
 App::$strings["Add privacy group"] = "Privacygroep toevoegen";
 App::$strings["Channels not in any privacy group"] = "Kanalen die zich in geen enkele privacygroep bevinden";
-App::$strings["Image/photo"] = "Afbeelding/foto";
-App::$strings["Encrypted content"] = "Versleutelde inhoud";
-App::$strings["Install %s element: "] = "Installeer %s-element: ";
-App::$strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Dit bericht heeft een te installeren %s-element, maar je hebt geen permissies om het op deze hub te installeren.";
-App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s schreef het volgende %2\$s %3\$s";
-App::$strings["Click to open/close"] = "Klik om te openen of te sluiten";
-App::$strings["spoiler"] = "spoiler";
-App::$strings["Different viewers will see this text differently"] = "Deze tekst wordt per persoon anders weergeven.";
-App::$strings["$1 wrote:"] = "$1 schreef:";
-App::$strings["%1\$s is now connected with %2\$s"] = "%1\$s is nu met %2\$s verbonden";
-App::$strings["%1\$s poked %2\$s"] = "%1\$s heeft %2\$s aangestoten";
-App::$strings["poked"] = "aangestoten";
-App::$strings["View %s's profile @ %s"] = "Bekijk het profiel van %s @ %s";
-App::$strings["Categories:"] = "Categorieën:";
-App::$strings["Filed under:"] = "Bewaard onder:";
-App::$strings["View in context"] = "In context bekijken";
-App::$strings["remove"] = "verwijderen";
-App::$strings["Delete Selected Items"] = "Verwijder de geselecteerde items";
-App::$strings["View Source"] = "Bron weergeven";
-App::$strings["Follow Thread"] = "Conversatie volgen";
-App::$strings["Unfollow Thread"] = "Conversatie niet meer volgen";
-App::$strings["Activity/Posts"] = "Activiteit/berichten connectie";
-App::$strings["Edit Connection"] = "Connectie bewerken";
-App::$strings["Message"] = "Bericht";
-App::$strings["%s likes this."] = "%s vindt dit leuk.";
-App::$strings["%s doesn't like this."] = "%s vindt dit niet leuk.";
-App::$strings["<span  %1\$s>%2\$d people</span> like this."] = array(
-	0 => "<span  %1\$s>%2\$d persoon</span> vindt dit leuk.",
-	1 => "<span  %1\$s>%2\$d personen</span> vinden dit leuk.",
-);
-App::$strings["<span  %1\$s>%2\$d people</span> don't like this."] = array(
-	0 => "<span  %1\$s>%2\$d persoon</span> vindt dit niet leuk.",
-	1 => "<span  %1\$s>%2\$d personen</span> vinden dit niet leuk.",
-);
-App::$strings["and"] = "en";
-App::$strings[", and %d other people"] = array(
-	0 => ", en %d ander persoon",
-	1 => ", en %d andere personen",
-);
-App::$strings["%s like this."] = "%s vinden dit leuk.";
-App::$strings["%s don't like this."] = "%s vinden dit niet leuk.";
-App::$strings["Set your location"] = "Locatie instellen";
-App::$strings["Clear browser location"] = "Locatie van webbrowser wissen";
-App::$strings["Tag term:"] = "Tag:";
-App::$strings["Where are you right now?"] = "Waar bevind je je op dit moment?";
-App::$strings["Page link name"] = "Linknaam pagina";
-App::$strings["Post as"] = "Bericht plaatsen als";
-App::$strings["Toggle voting"] = "Peiling in- of uitschakelen";
-App::$strings["Categories (optional, comma-separated list)"] = "Categorieën (optioneel, door komma's gescheiden lijst)";
-App::$strings["Set publish date"] = "Publicatiedatum instellen";
-App::$strings["OK"] = "OK";
-App::$strings["Discover"] = "Ontdekken";
-App::$strings["Imported public streams"] = "Openbare streams importeren";
-App::$strings["Commented Order"] = "Nieuwe reacties bovenaan";
-App::$strings["Sort by Comment Date"] = "Berichten met nieuwe reacties bovenaan";
-App::$strings["Posted Order"] = "Nieuwe berichten bovenaan";
-App::$strings["Sort by Post Date"] = "Nieuwe berichten bovenaan";
-App::$strings["Posts that mention or involve you"] = "Alleen berichten die jou vermelden of waar je op een andere manier bij betrokken bent";
-App::$strings["Activity Stream - by date"] = "Activiteitenstroom - volgens datum";
-App::$strings["Starred"] = "Met ster";
-App::$strings["Favourite Posts"] = "Favoriete berichten";
-App::$strings["Spam"] = "Spam";
-App::$strings["Posts flagged as SPAM"] = "Berichten gemarkeerd als SPAM";
-App::$strings["Status Messages and Posts"] = "Berichten in dit kanaal";
-App::$strings["About"] = "Over";
-App::$strings["Profile Details"] = "Profiel";
-App::$strings["Files and Storage"] = "Bestanden en opslagruimte";
-App::$strings["Saved Bookmarks"] = "Opgeslagen bladwijzers";
-App::$strings["Manage Webpages"] = "Webpagina's beheren";
-App::$strings["__ctx:noun__ Attending"] = array(
-	0 => "aanwezig",
-	1 => "aanwezig",
-);
-App::$strings["__ctx:noun__ Not Attending"] = array(
-	0 => "niet aanwezig",
-	1 => "niet aanwezig",
-);
-App::$strings["__ctx:noun__ Undecided"] = array(
-	0 => "nog niet beslist",
-	1 => "nog niet beslist",
-);
-App::$strings["__ctx:noun__ Agree"] = array(
-	0 => "eens",
-	1 => "eens",
-);
-App::$strings["__ctx:noun__ Disagree"] = array(
-	0 => "oneens",
-	1 => "oneens",
-);
-App::$strings["__ctx:noun__ Abstain"] = array(
-	0 => "onthouding",
-	1 => "onthoudingen",
-);
 App::$strings["prev"] = "vorige";
 App::$strings["first"] = "eerste";
 App::$strings["last"] = "laatste";
@@ -2093,23 +2124,10 @@ App::$strings["Select an alternate language"] = "Kies een andere taal";
 App::$strings["activity"] = "activiteit";
 App::$strings["Design Tools"] = "Ontwerp-hulpmiddelen";
 App::$strings["Pages"] = "Pagina's";
-App::$strings["Not a valid email address"] = "Geen geldig e-mailadres";
-App::$strings["Your email domain is not among those allowed on this site"] = "Jouw e-maildomein is op deze hub niet toegestaan";
-App::$strings["Your email address is already registered at this site."] = "Jouw e-mailadres is al op deze hub geregistreerd.";
-App::$strings["An invitation is required."] = "Een uitnodiging is vereist";
-App::$strings["Invitation could not be verified."] = "Uitnodiging kon niet geverifieerd worden";
-App::$strings["Please enter the required information."] = "Vul de vereiste informatie in.";
-App::$strings["Failed to store account information."] = "Account-informatie kon niet opgeslagen worden.";
-App::$strings["Registration confirmation for %s"] = "Registratiebevestiging voor %s";
-App::$strings["Registration request at %s"] = "Registratiebevestiging voor %s";
-App::$strings["your registration password"] = "jouw registratiewachtwoord";
-App::$strings["Registration details for %s"] = "Registratiegegevens voor %s";
-App::$strings["Account approved."] = "Account goedgekeurd";
-App::$strings["Registration revoked for %s"] = "Registratie ingetrokken voor %s";
-App::$strings["Account verified. Please login."] = "Account is geverifieerd. Je kan inloggen.";
-App::$strings["Click here to upgrade."] = "Klik hier om te upgraden.";
-App::$strings["This action exceeds the limits set by your subscription plan."] = "Deze handeling overschrijdt de beperkingen die voor jouw abonnement gelden.";
-App::$strings["This action is not available under your subscription plan."] = "Deze handeling is niet mogelijk met jouw abonnement.";
+App::$strings["Invalid data packet"] = "Datapakket ongeldig";
+App::$strings["Unable to verify channel signature"] = "Kanaalkenmerk kon niet worden geverifieerd.  ";
+App::$strings["Unable to verify site signature for %s"] = "Hubkenmerk voor %s kon niet worden geverifieerd";
+App::$strings["invalid target signature"] = "ongeldig doelkenmerk";
 App::$strings["Tags"] = "Tags";
 App::$strings["Keywords"] = "Trefwoorden";
 App::$strings["have"] = "heb";
@@ -2118,20 +2136,6 @@ App::$strings["want"] = "wil";
 App::$strings["wants"] = "wil";
 App::$strings["likes"] = "vindt dit leuk";
 App::$strings["dislikes"] = "vindt dit niet leuk";
-App::$strings["Visible to your default audience"] = "Voor iedereen zichtbaar, mits niet anders ingesteld";
-App::$strings["Only me"] = "Alleen ik";
-App::$strings["Public"] = "Openbaar";
-App::$strings["Anybody in the \$Projectname network"] = "Iedereen in het \$Projectname-netwerk";
-App::$strings["Any account on %s"] = "Iedereen op %s";
-App::$strings["Any of my connections"] = "Al mijn geaccepteerde connecties";
-App::$strings["Only connections I specifically allow"] = "Alleen connecties die uitdrukkelijk door jou zijn toegestaan";
-App::$strings["Anybody authenticated (could include visitors from other networks)"] = "Geauthenticeerde leden  (kan bezoekers van andere netwerken bevatten)";
-App::$strings["Any connections including those who haven't yet been approved"] = "Al mijn geaccepteerde en nog niet geaccepteerde connecties";
-App::$strings["This is your default setting for the audience of your normal stream, and posts."] = "Dit is de standaard privacy-instelling voor wie jouw berichten kan bekijken";
-App::$strings["This is your default setting for who can view your default channel profile"] = "Dit is de standaard privacy-instelling voor wie jouw standaardprofiel kan bekijken";
-App::$strings["This is your default setting for who can view your connections"] = "Dit is de standaard privacy-instelling voor wie een lijst met jouw connecties kan bekijken";
-App::$strings["This is your default setting for who can view your file storage and photos"] = "Dit is de standaard privacy-instelling voor wie jouw bestanden en foto's kan bekijken";
-App::$strings["This is your default setting for the audience of your webpages"] = "Dit is de standaard privacy-instelling voor wie jouw webpagina's kan bekijken";
 App::$strings["Delete this item?"] = "Dit item verwijderen?";
 App::$strings["[-] show less"] = "[-] minder reacties weergeven";
 App::$strings["[+] expand"] = "[+] uitklappen";
@@ -2190,21 +2194,27 @@ App::$strings["__ctx:calendar__ month"] = "maand";
 App::$strings["__ctx:calendar__ week"] = "week";
 App::$strings["__ctx:calendar__ day"] = "dag";
 App::$strings["__ctx:calendar__ All day"] = "hele dag";
-App::$strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "Kan geen dubbele kanaal-identificator op deze hub aanmaken. Importeren mislukt.";
-App::$strings["Channel clone failed. Import failed."] = "Het klonen van het kanaal is mislukt. Importeren mislukt.";
-App::$strings["(Unknown)"] = "(Onbekend)";
-App::$strings["Visible to anybody on the internet."] = "Voor iedereen op het internet zichtbaar.";
-App::$strings["Visible to you only."] = "Alleen voor jou zichtbaar.";
-App::$strings["Visible to anybody in this network."] = "Voor iedereen in dit netwerk zichtbaar.";
-App::$strings["Visible to anybody authenticated."] = "Voor iedereen die geauthenticeerd is zichtbaar.";
-App::$strings["Visible to anybody on %s."] = "Voor iedereen op %s zichtbaar.";
-App::$strings["Visible to all connections."] = "Voor alle connecties zichtbaar.";
-App::$strings["Visible to approved connections."] = "Voor alle geaccepteerde connecties zichtbaar.";
-App::$strings["Visible to specific connections."] = "Voor specifieke connecties zichtbaar.";
-App::$strings["Privacy group is empty."] = "Privacygroep is leeg";
-App::$strings["Privacy group: %s"] = "Privacygroep: %s";
-App::$strings["Connection not found."] = "Connectie niet gevonden.";
-App::$strings["profile photo"] = "profielfoto";
+App::$strings["Public"] = "Openbaar";
+App::$strings["Anybody in the \$Projectname network"] = "Iedereen in het \$Projectname-netwerk";
+App::$strings["Any account on %s"] = "Iedereen op %s";
+App::$strings["Any of my connections"] = "Al mijn geaccepteerde connecties";
+App::$strings["Only connections I specifically allow"] = "Alleen connecties die uitdrukkelijk door jou zijn toegestaan";
+App::$strings["Anybody authenticated (could include visitors from other networks)"] = "Geauthenticeerde leden  (kan bezoekers van andere netwerken bevatten)";
+App::$strings["Any connections including those who haven't yet been approved"] = "Al mijn geaccepteerde en nog niet geaccepteerde connecties";
+App::$strings["This is your default setting for the audience of your normal stream, and posts."] = "Dit is de standaard privacy-instelling voor wie jouw berichten kan bekijken";
+App::$strings["This is your default setting for who can view your default channel profile"] = "Dit is de standaard privacy-instelling voor wie jouw standaardprofiel kan bekijken";
+App::$strings["This is your default setting for who can view your connections"] = "Dit is de standaard privacy-instelling voor wie een lijst met jouw connecties kan bekijken";
+App::$strings["This is your default setting for who can view your file storage and photos"] = "Dit is de standaard privacy-instelling voor wie jouw bestanden en foto's kan bekijken";
+App::$strings["This is your default setting for the audience of your webpages"] = "Dit is de standaard privacy-instelling voor wie jouw webpagina's kan bekijken";
+App::$strings[" and "] = " en ";
+App::$strings["public profile"] = "openbaar profiel";
+App::$strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s veranderde %2\$s naar &ldquo;%3\$s&rdquo;";
+App::$strings["Visit %1\$s's %2\$s"] = "Bezoek het %2\$s van %1\$s";
+App::$strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s heeft een aangepaste %2\$s, %3\$s veranderd.";
+App::$strings["Directory Options"] = "Opties kanalengids";
+App::$strings["Safe Mode"] = "Veilig zoeken";
+App::$strings["Public Forums Only"] = "Alleen openbare forums";
+App::$strings["This Website Only"] = "Alleen deze hub";
 App::$strings["New Page"] = "Nieuwe pagina";
 App::$strings["Title"] = "Titel";
 App::$strings["Can view my normal stream and posts"] = "Kan mijn normale kanaalstream en berichten bekijken";
@@ -2242,28 +2252,8 @@ App::$strings["Special Purpose"] = "Speciaal doel";
 App::$strings["Special - Celebrity/Soapbox"] = "Speciaal - Beroemdheid/alleen volgen";
 App::$strings["Special - Group Repository"] = "Speciaal - Groepsopslag";
 App::$strings["Custom/Expert Mode"] = "Expertmodus/handmatig aanpassen";
-App::$strings["Site Admin"] = "Hubbeheerder";
-App::$strings["Bug Report"] = "Bugrapport";
-App::$strings["View Bookmarks"] = "Bladwijzers bekijken";
-App::$strings["My Chatrooms"] = "Mijn chatkanalen";
-App::$strings["Firefox Share"] = "Firefox Share";
-App::$strings["Remote Diagnostics"] = "Diagnose op afstand";
-App::$strings["Probe"] = "Onderzoeken";
-App::$strings["Suggest"] = "Voorstellen";
-App::$strings["Random Channel"] = "Willekeurig kanaal";
-App::$strings["Invite"] = "Uitnodigen ";
-App::$strings["Post"] = "Bericht";
-App::$strings["Purchase"] = "Aanschaffen";
 App::$strings["Attachments:"] = "Bijlagen:";
 App::$strings["\$Projectname event notification:"] = "Notificatie \$Projectname-gebeurtenis:";
-App::$strings["Add others"] = "Meer toevoegen";
-App::$strings["Who can see this?"] = "Wie kan dit zien?";
-App::$strings["Custom selection"] = "Handmatige selectie";
-App::$strings["Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit the scope of \"Show\"."] = "Kies \"Tonen\" om weergave toe te staan.  Met \"Niet tonen\" kan je uitzonderingen maken op \"Tonen\".";
-App::$strings["Show"] = "Tonen";
-App::$strings["Don't show"] = "Niet tonen";
-App::$strings["Other networks and post services"] = "Andere netwerken en diensten";
-App::$strings["Post permissions %s cannot be changed %s after a post is shared.</br />These permissions set who is allowed to view the post."] = "Permissies van berichten %s zijn niet meer te veranderen %s nadat een bericht is gedeeld.</br />Met deze permissies bepaal je wie het bericht kan zien.";
 App::$strings["Focus (Hubzilla default)"] = "Focus (Hubzilla-standaard)";
 App::$strings["Theme settings"] = "Thema-instellingen";
 App::$strings["Select scheme"] = "Kies schema van thema";
diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_accounts.tpl
index ae77ef24c..53f5f1aba 100755
--- a/view/tpl/admin_users.tpl
+++ b/view/tpl/admin_accounts.tpl
@@ -13,7 +13,7 @@
 <div class="generic-content-wrapper-styled" id="adminpage">
 	<h1>{{$title}} - {{$page}}</h1>
 
-	<form action="{{$baseurl}}/admin/users" method="post">
+	<form action="{{$baseurl}}/admin/accounts" method="post">
 		<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
 
 		<h3>{{$h_pending}}</h3>
@@ -52,7 +52,7 @@
 			<table id="users">
 				<thead>
 				<tr>
-					{{foreach $th_users as $th}}<th>{{$th}}</th>{{/foreach}}
+					{{foreach $th_users as $th}}<th><a href="{{$base}}&key={{$th.1}}&dir={{$odir}}">{{$th.0}}</a></th>{{/foreach}}
 					<th></th>
 					<th></th>
 				</tr>
@@ -73,7 +73,7 @@
 						<td class="service_class">{{$u.account_service_class}}</td>
 						<td class="checkbox_bulkedit"><input type="checkbox" class="users_ckbx" id="id_user_{{$u.account_id}}" name="user[]" value="{{$u.account_id}}"><input type="hidden" name="blocked[]" value="{{$u.blocked}}"></td>
 						<td class="tools">
-							<a href="{{$baseurl}}/admin/users/{{if ($u.blocked)}}un{{/if}}block/{{$u.account_id}}?t={{$form_security_token}}"  class="btn btn-default btn-xs" title='{{if ($u.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class="fa fa-ban admin-icons{{if ($u.blocked)}} dim{{/if}}"></i></a><a href="{{$baseurl}}/admin/users/delete/{{$u.account_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><i class="fa fa-trash-o admin-icons"></i></a>
+							<a href="{{$baseurl}}/admin/accounts/{{if ($u.blocked)}}un{{/if}}block/{{$u.account_id}}?t={{$form_security_token}}"  class="btn btn-default btn-xs" title='{{if ($u.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class="fa fa-ban admin-icons{{if ($u.blocked)}} dim{{/if}}"></i></a><a href="{{$baseurl}}/admin/accounts/delete/{{$u.account_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><i class="fa fa-trash-o admin-icons"></i></a>
 						</td>
 					</tr>
 				{{/foreach}}
diff --git a/view/tpl/admin_channels.tpl b/view/tpl/admin_channels.tpl
index 6db963304..f15742f78 100755
--- a/view/tpl/admin_channels.tpl
+++ b/view/tpl/admin_channels.tpl
@@ -21,7 +21,7 @@
 			<table id='channels'>
 				<thead>
 				<tr>
-					{{foreach $th_channels as $th}}<th>{{$th}}</th>{{/foreach}}
+					{{foreach $th_channels as $th}}<th><a href="{{$base}}&key={{$th.1}}&dir={{$odir}}">{{$th.0}}</a></th>{{/foreach}}
 					<th></th>
 					<th></th>
 				</tr>