diff --git a/CHANGELOG b/CHANGELOG
index d708278b6..cf8386317 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,52 @@
+Hubzilla 1.6
+	Cleanup and standardise the interfaces to the "jot" editor
+	Router re-written to support calling class object methods as controllers
+	All existing modules (160+) re-written as object classes
+	Plugin hook interface adapted to call static class methods
+	Context help improved dramatically with content for the most accessed pages.
+	Reverted a compatibility change to support GNU-social events. We copied their feed format and their feed format is wrong (XML namespace collisions).
+	Provide a querystring attribute to CSS/JS resources to avoid caching issues when our code changes (which is often). 
+	Fix javascript detection and allow either positive or negative detection.
+	Refactor the plugin hook registration procedure, provide 'unregister all' ability.
+	Fix RSD (Real Simple Discovery) which has been broken for some time.
+	Update smarty library to 3.1.29
+	Update jquery.textcomplete to 1.3.4
+	Update font-awesome to 4.6.1
+	Update SabreDAV to 3.0 (PHP version requirements prevent us from pushing it further at this time)
+	Help text added to cmdline utilities config and pconfig
+	Reworking of the database logging facility to avoid the rare but troublesome recursion when the log facility needed to query the DB internally to obtain config parameters. 
+	Implement singleton delivery (emulate nomadic identity to singleton networks and services)
+	Fix empty album name in photo activities when photo is stored in top level folder.
+	Allow engineering units to be used in service class data size restrictions (400M, 1G, etc.)
+	Lots of work on bbcode auto-completion
+	Admin interface provided to manage external resource repositories
+ 	Oembed security reworked. Now all sources are filtered by default unless blocked.
+	Remove the date-string version and use only STD_VERSION
+	Add categories and categorisation filtering and the ability to edit all apps (including system apps) for a given channel 
+	Ensure the ability to translate names of all system apps (except those provided in addons)
+	Provide ability to add categories to content from channel sources
+	Lots of work on the presentation of the ACL widget to enhance usability and intuitiveness
+	Allow somebody to follow a channel from a pasted redress containing a Unicode lookalike of the @ sign.
+	Add conditional syntax to Comanche (if/then/else)
+	Convert Comanche to an object class
+	Removed IE6 compatibility code
+	Explicitly close DB on shutdown/exit instead of allowing it to close naturally
+	Allowed delayed publish of webpages
+	Show current repository versions of master and dev on admin page and warn if your installation has fallen behind master
+	Provide some extra security checks to import data and files to prevent mischief
+	Block CalDAV/CardDAV namespace reserved words from being used as a channel nickname/redress since Sabre is somewhat inflexible in this regard
+	Plugins:
+		Diaspora 
+			markdown translator work needed to eradicate the Diaspora Comment Virus.    
+			upgrade all inbound paths with the most recent protocol changes (several of these)
+			convert 'diaspora_meta' (Diaspora Comment Virus) to iconfig and eradicate from sites with Diaspora disabled
+			implement social relay and allow following tags
+			upgrade statistics.json to NodeInfo. Currently hubzilla sites are tagged as 'redmatrix' because the NodeInfo schema lacks extensibility and project names are used to designate protocol compatibility rather than protocol names.
+		Std-embeds
+			New addon to allow a handful of corporate providers to run unfiltered embed code (youtube, vimeo, soundcloud) 
+		Various:
+			upgrade font-awesome icons and adapt a few addons to Objects and the new hook interface and new controller interface
+			
 Hubzilla 1.4
 	[This list may appear brief, but encompasses a huge amount of re-writing and re-factoring
 	of the internal code structure to gain long-term performance and stability and provide a standard
diff --git a/Zotlabs/Module/Admin.php b/Zotlabs/Module/Admin.php
index e77cf0fc7..9b54a4081 100644
--- a/Zotlabs/Module/Admin.php
+++ b/Zotlabs/Module/Admin.php
@@ -1733,6 +1733,19 @@ class Admin extends \Zotlabs\Web\Controller {
 				} else {
 					json_return_and_die(array('message' => 'No repo name provided.', 'success' => false));
 				}
+				$extendDir = __DIR__ . '/../../store/git/sys/extend';
+				$addonDir = $extendDir . '/addon';
+				if (!file_exists($extendDir)) {
+					if (!mkdir($extendDir, 0770, true)) {
+						logger('Error creating extend folder: ' . $extendDir);
+						json_return_and_die(array('message' => 'Error creating extend folder: ' . $extendDir, 'success' => false));
+					} else {
+						if (!symlink(__DIR__ . '/../../extend/addon', $addonDir)) {
+							logger('Error creating symlink to addon folder: ' . $addonDir);
+							json_return_and_die(array('message' => 'Error creating symlink to addon folder: ' . $addonDir, 'success' => false));
+						}
+					}
+				}
 				$repoDir = __DIR__ . '/../../store/git/sys/extend/addon/' . $repoName;
 				if (!is_dir($repoDir)) {
 					logger('Repo directory does not exist: ' . $repoDir);
@@ -1758,6 +1771,19 @@ class Admin extends \Zotlabs\Web\Controller {
 				} else {
 					json_return_and_die(array('message' => 'No repo name provided.', 'success' => false));
 				}
+				$extendDir = __DIR__ . '/../../store/git/sys/extend';
+				$addonDir = $extendDir . '/addon';
+				if (!file_exists($extendDir)) {
+					if (!mkdir($extendDir, 0770, true)) {
+						logger('Error creating extend folder: ' . $extendDir);
+						json_return_and_die(array('message' => 'Error creating extend folder: ' . $extendDir, 'success' => false));
+					} else {
+						if (!symlink(__DIR__ . '/../../extend/addon', $addonDir)) {
+							logger('Error creating symlink to addon folder: ' . $addonDir);
+							json_return_and_die(array('message' => 'Error creating symlink to addon folder: ' . $addonDir, 'success' => false));
+						}
+					}
+				}
 				$repoDir = __DIR__ . '/../../store/git/sys/extend/addon/' . $repoName;
 				if (!is_dir($repoDir)) {
 					logger('Repo directory does not exist: ' . $repoDir);
diff --git a/Zotlabs/Render/Comanche.php b/Zotlabs/Render/Comanche.php
index 776874e35..1017ec6aa 100644
--- a/Zotlabs/Render/Comanche.php
+++ b/Zotlabs/Render/Comanche.php
@@ -8,7 +8,6 @@ require_once('include/widgets.php');
 
 
 
-
 class Comanche {
 
 
@@ -95,7 +94,7 @@ class Comanche {
 		$cnt = preg_match_all("/\[region=(.*?)\](.*?)\[\/region\]/ism", $s, $matches, PREG_SET_ORDER);
 		if($cnt) {
 			foreach($matches as $mtch) {
-				\App::$layout['region_' . $mtch[1]] = $this->region($mtch[2]);
+				\App::$layout['region_' . $mtch[1]] = $this->region($mtch[2],$mtch[1]);
 			}
 		}
 	}
@@ -320,7 +319,9 @@ class Comanche {
 	}
 
 
-	function region($s) {
+	function region($s,$region_name) {
+
+		$s = str_replace('$region',$region_name,$s);
 
 		$matches = array();
 
diff --git a/Zotlabs/Storage/BasicAuth.php b/Zotlabs/Storage/BasicAuth.php
index da5af7659..02c4117da 100644
--- a/Zotlabs/Storage/BasicAuth.php
+++ b/Zotlabs/Storage/BasicAuth.php
@@ -73,6 +73,9 @@ class BasicAuth extends DAV\Auth\Backend\AbstractBasic {
 	protected $timezone = '';
 
 
+	public $module_disabled = false;
+
+
 	/**
 	 * @brief Validates a username and password.
 	 *
@@ -92,7 +95,7 @@ class BasicAuth extends DAV\Auth\Backend\AbstractBasic {
 				intval($record['account_id']),
 				intval($record['account_default_channel'])
 			);
-			if ($r) {
+			if($r && $this->check_module_access($r[0]['channel_id'])) {
 				return $this->setAuthenticated($r[0]);
 			}
 		}
@@ -109,13 +112,17 @@ class BasicAuth extends DAV\Auth\Backend\AbstractBasic {
 					if ((($record['account_flags'] == ACCOUNT_OK) || ($record['account_flags'] == ACCOUNT_UNVERIFIED))
 					&& (hash('whirlpool', $record['account_salt'] . $password) === $record['account_password'])) {
 						logger('password verified for ' . $username);
-						return $this->setAuthenticated($r[0]);
+						if($this->check_module_access($r[0]['channel_id']))
+							return $this->setAuthenticated($r[0]);
 					}
 				}
 			}
 		}
 
-		$error = 'password failed for ' . $username;
+		if($this->module_disabled)
+			$error = 'module not enabled for ' . $username;
+		else
+			$error = 'password failed for ' . $username;
 		logger($error);
 		log_failed_login($error);
 
@@ -139,6 +146,17 @@ class BasicAuth extends DAV\Auth\Backend\AbstractBasic {
 		return true;
 	}
 
+	protected function check_module_access($channel_id) {
+		if($channel_id && \App::$module === 'cdav') {
+			$x = get_pconfig($channel_id,'cdav','enabled');
+			if(! $x) {
+				$this->module_disabled = true;
+				return false;
+			}
+		}
+		return true;
+	}
+
 	/**
 	 * Sets the channel_name from the currently logged-in channel.
 	 *
diff --git a/Zotlabs/Web/Session.php b/Zotlabs/Web/Session.php
index e18ad38fb..c26b3523c 100644
--- a/Zotlabs/Web/Session.php
+++ b/Zotlabs/Web/Session.php
@@ -13,10 +13,10 @@ namespace Zotlabs\Web;
 
 class Session {
 
-	private static $handler = null;
-	private static $session_started = false;
+	private $handler = null;
+	private $session_started = false;
 
-	function init() {
+	public function init() {
 
 		$gc_probability = 50;
 
@@ -29,7 +29,8 @@ class Session {
 		 */
 
 		$handler = new \Zotlabs\Web\SessionHandler();
-		self::$handler = $handler;
+
+		$this->handler = $handler;
 
 		$x = session_set_save_handler($handler,false);
 		if(! $x)
@@ -38,11 +39,12 @@ class Session {
 		// Force cookies to be secure (https only) if this site is SSL enabled. 
 		// Must be done before session_start().
 
+
 		$arr = session_get_cookie_params();
 		session_set_cookie_params(
 			((isset($arr['lifetime']))   ? $arr['lifetime'] : 0),
 			((isset($arr['path']))      ? $arr['path']     : '/'),
-			((isset($arr['domain']))    ? $arr['domain']   : App::get_hostname()),
+			(($arr['domain'])    ? $arr['domain']   : \App::get_hostname()),
 			((isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') ? true : false),
 			((isset($arr['httponly']))  ? $arr['httponly'] : true)
 		);
@@ -51,9 +53,9 @@ class Session {
 
 	}
 
-	function start() {
+	public function start() {
 		session_start();
-		self::$session_started = true;
+		$this->session_started = true;
 	}
 
 	/**
@@ -62,8 +64,8 @@ class Session {
 	 * @return void
 	 */
 
-	function nuke() {
-		self::new_cookie(0); // 0 means delete on browser exit
+	public function nuke() {
+		$this->new_cookie(0); // 0 means delete on browser exit
 		if($_SESSION && count($_SESSION)) {
 			foreach($_SESSION as $k => $v) {
 				unset($_SESSION[$k]);
@@ -71,48 +73,52 @@ class Session {
 		}
 	}
 
-	function new_cookie($xtime) {
+	public function new_cookie($xtime) {
 
 		$newxtime = (($xtime> 0) ? (time() + $xtime) : 0);
 
 		$old_sid = session_id();
 
-		if(self::$handler && self::$session_started) {
+		$arr = session_get_cookie_params();
+
+		if($this->handler && $this->session_started) {
 			session_regenerate_id(true);
 
 			// force SessionHandler record creation with the new session_id
 			// which occurs as a side effect of read()
 
-			self::$handler->read(session_id());
+			$this->handler->read(session_id());
 		}
 		else 
 			logger('no session handler');
 
 		if (x($_COOKIE, 'jsdisabled')) {
-			setcookie('jsdisabled', $_COOKIE['jsdisabled'], $newxtime);
+			setcookie('jsdisabled', $_COOKIE['jsdisabled'], $newxtime, '/', \App::get_hostname(),((isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') ? true : false),((isset($arr['httponly']))  ? $arr['httponly'] : true));
 		}
-		setcookie(session_name(),session_id(),$newxtime);
+		setcookie(session_name(),session_id(),$newxtime, '/', \App::get_hostname(),((isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') ? true : false),((isset($arr['httponly']))  ? $arr['httponly'] : true));
 
 		$arr = array('expire' => $xtime);
 		call_hooks('new_cookie', $arr);
 
 	}
 
-	function extend_cookie() {
+	public function extend_cookie() {
+
+		$arr = session_get_cookie_params();
 
 		// if there's a long-term cookie, extend it
 
 		$xtime = (($_SESSION['remember_me']) ? (60 * 60 * 24 * 365) : 0 );
 
 		if($xtime)
-			setcookie(session_name(),session_id(),(time() + $xtime));
+			setcookie(session_name(),session_id(),(time() + $xtime), '/', \App::get_hostname(),((isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') ? true : false),((isset($arr['httponly']))  ? $arr['httponly'] : true));
 		$arr = array('expire' => $xtime);
 		call_hooks('extend_cookie', $arr);
 
 	}
 
 
-	function return_check() {
+	public function return_check() {
 
 		// check a returning visitor against IP changes.
 		// If the change results in being blocked from re-entry with the current cookie
@@ -152,7 +158,7 @@ class Session {
 					// check any difference at all
 					logger('Session address changed. Paranoid setting in effect, blocking session. '
 					. $_SESSION['addr'] . ' != ' . $_SERVER['REMOTE_ADDR']);
-					self::nuke();
+					$this->nuke();
 					goaway(z_root());
 					break;
 			}
diff --git a/boot.php b/boot.php
index 9dbd4ead4..381111b26 100755
--- a/boot.php
+++ b/boot.php
@@ -632,6 +632,19 @@ class ZotlabsAutoloader {
                 return TRUE;
             }
         }
+		$arr = explode('\\',$className);
+		if($arr && count($arr) > 1) {
+			if(! $arr[0])
+				$arr = array_shift($arr);
+	        $filename = 'addon/' . lcfirst($arr[0]) . '/' . $arr[1] . ((count($arr) === 2) ? '.php' : '/' . $arr[2] . ".php");
+    	    if (file_exists($filename)) {
+        	    include($filename);
+            	if (class_exists($className)) {
+                	return TRUE;
+	            }
+    	    }
+		}
+
         return FALSE;
     }
 }
@@ -687,6 +700,7 @@ class App {
 	private static $perms      = null;            // observer permissions
 	private static $widgets    = array();         // widgets for this page
 
+	public static  $session    = null;
 	public static  $groups;
 	public static  $language;
 	public static  $langsave;
@@ -1656,7 +1670,8 @@ function goaway($s) {
 
 function shutdown() {
 	global $db;
-	$db->close();
+	if(is_object($db) && $db->connected)
+		$db->close();
 }
 
 /**
diff --git a/doc/addons.bb b/doc/addons.bb
index 67282521f..325a219ec 100644
--- a/doc/addons.bb
+++ b/doc/addons.bb
@@ -2,10 +2,12 @@
 [list=1]
 [*] abcjsplugin - Create musical scores in your posts
 [*] adultphotoflag - prevents nsfw photos from being displayed in public albums
+[*] b2tbtn - provide button to go directly to top of page if you are scrolled a long way down
 [*] bbmath - use complex math expressions in your posts
 [*] bookmarker - replace #^ with bookmark link in posts
 [*] buglink - provide a bug reporting icon in the lower-left corner of every page
 [*] calc - a scientific calculator
+[*] cdav - CalDAV/CardDAV server
 [*] chess - cross domain identity aware interactive chess games
 [*] chords - generate fingering charts and alternatives for every known guitar chord
 [*] custom_home - set a custom page as the hub start page
@@ -13,18 +15,24 @@
 [*] diaspora - Diaspora protocol emulator
 [*] diaspost - crosspost to a Diaspora account (different from the Diaspora protocol emulator)
 [*] dirstats - show some interesting statistics generated by the driectory server
+[*] docs - alternate documentation pages
 [*] donate - provides a project donation page
 [*] dwpost - crosspost to Dreamwidth
+[*] embedphotos - tool to embed photos from your albums in a post
 [*] extcron - use an external cron service to run your hub's scheduled tasks
 [*] flattrwidget - provides a "Flattr Us" button
 [*] flip - create upside down text
 [*] fortunate - displays random quote (fortune cookie). Requires setting up a fortune server.
+[*] friendica - Friendica (DFRN) protocol. Under development.
 [*] frphotos - import photo albums from Friendica
+[*] gnusoc - GNU-Social (OStatus) protocol. Under development. 
 [*] hexit - headecimal conversion tool
+[*] hubwall - send an admin email to all hub accounts
 [*] ijpost - crosspost to Insanejournal
 [*] irc - connect to IRC chatrooms
 [*] jappixmini - XMPP chat
-[*] jsupload - (recommended) upload multiple photos to photo albums at once.
+[*] jsupload - upload multiple photos to photo albums at once.
+[*] keepout - prevents nearly all use of site when not logged in, more restrictive than 'block public' setting
 [*] ldapauth - login via account on LDAP or Windows Active Directory domain 
 [*] libertree - crosspost to Libertree
 [*] likebanner - create a "like us on red#matrix" banner image
@@ -32,6 +40,7 @@
 [*] logrot - logfile rotation utility
 [*] mahjongg - Chinese puzzle game
 [*] mailhost - when using multiple channel clones, select one to receive email notifications
+[*] metatag - provide SEO friendly pages 
 [*] mayan_places - set location field to a random city in the Mayan world
 [*] morechoice - additional gender/sexual-preference choices for profiles (not safe for work)
 [*] moremoods - Additional mood options
@@ -60,6 +69,7 @@
 [*] startpage - set a personal preferred page to redirect after logging in.
 [*] statistics_json - Diaspora statistics generator
 [*] statusnet - GNU-social and StatusNet crosspost [zrl=[baseurl]/help/addons_gnusocial]Posting To Gnu Social[/zrl]
+[*] std_embeds - allow unfiltered embeds for popular providers like youtube, vimeo and soundcloud
 [*] superblock - Highly recommended - completely block an offensive channel from your stream
 [*] testdrive - Turns your hub into a test drive site with accounts that expire after a trail period.
 [*] tictac - 3D tic-tac-toe
diff --git a/doc/context/es-es b/doc/context/es-es
new file mode 120000
index 000000000..6c4381495
--- /dev/null
+++ b/doc/context/es-es
@@ -0,0 +1 @@
+es
\ No newline at end of file
diff --git a/doc/context/es/admin/logs/help.html b/doc/context/es/admin/logs/help.html
index 2324492bf..3a2ec413d 100644
--- a/doc/context/es/admin/logs/help.html
+++ b/doc/context/es/admin/logs/help.html
@@ -1,36 +1,9 @@
-<html>
-  <head>
-    <meta content="text/html; charset=windows-1252" http-equiv="content-type">
-  </head>
-  <body>
     <dl class="dl-horizontal">
       <dt>General</dt>
-      <dd><span id="result_box" class="" lang="es"><span>Esta página</span> <span>le
-            permite ajustar</span> <span>los parámetros de los informes del
-            sistema (logs)</span> <span>y para</span> <span>ver uno</span> <span>existente</span><span
-            class="">.</span></span></dd>
+      <dd>Esta página le permite ajustar los parámetros de los informes del sistema (logs) y para ver uno existente.</dd>
       <dt>Ajustes de los informes (logs)</dt>
-      <dd><span id="result_box" class="" lang="es"><span>Cuando se habilita la</span>
-          <span>opción de depuración</span><span>,</span> el <span>sistema de</span>
-          <span>información</span> <span class="">comenzará</span> a <span>añadir
-          </span>los informes (logs) <span>en el archivo especificado</span> <span>en
-            el cuadro</span> <span>"</span><span>Fichero de informes</span><span>"</span>
-          <span>(la </span><span class="">ruta es relativa</span> <span class="">al
-            directorio raíz del servidor</span><span>,</span> <span>por
-            ejemplo,</span> <span>/</span><span>var</span> <span>/</span><span>www</span><span
-            class="">)</span><span>.</span> <span>Tenga en cuenta que</span> <span
-            class="">este archivo</span> <span class="">tiene que</span> <span
-            class="">ser modificable por el</span> <span>servidor web</span><span>.</span></span></dd>
-      <dt>Nivel de depuración</dt>
-      <dd><span id="result_box" class="" lang="es"><span>La opción de</span> <span>nivel
-            de depuración</span> <span>le permite establecer</span> <span>la
-            cantidad de información</span> <span>que se</span> <span>anexa al
-            fichero de informes (logs)</span><span>.</span> <span>Advertencia</span><span>:</span>
-          <span>El aumento de</span> <span>este nivel</span> <span>puede
-            aumentar</span> <span>rápidamente el tamaño</span> <span>de este
-            fichero hasta en más de</span><span></span> <span>100 MB</span><span>,
-            especialmente</span> <span>en</span> <span>los hubs</span> <span>con</span>
-          <span>más que unos pocos</span> <span>miembros</span><span class="">.</span></span></dd>
+      <dd>Cuando se habilita la opción de depuración, el sistema de información comenzará a añadir los informes (logs) en el archivo especificado en el cuadro "Fichero de informes"
+          (la ruta es relativa al directorio raíz del servidor, por ejemplo, /var /www). Tenga en cuenta que este archivo tiene que ser modificable por el servidor web.</dd>
+      <dt>Nivel de depuración</dt>
+      <dd>La opción de nivel de depuración le permite establecer la cantidad de información que se anexa al fichero de informes (logs). Advertencia: El aumento de este nivel puede aumentar rápidamente el tamaño de este fichero hasta en más de 100 MB, especialmente en los hubs con más que unos pocos miembros.</dd>
     </dl>
-  </body>
-</html>
diff --git a/doc/context/es/admin/queue/help.html b/doc/context/es/admin/queue/help.html
index a4085c5c6..de9e6cdbb 100644
--- a/doc/context/es/admin/queue/help.html
+++ b/doc/context/es/admin/queue/help.html
@@ -1,17 +1,4 @@
-<html>
-  <head>
-    <meta content="text/html; charset=windows-1252" http-equiv="content-type">
-  </head>
-  <body>
     <dl class="dl-horizontal">
       <dt>General</dt>
-      <dd><span id="result_box" class="" lang="es"><span>Las estadísticas</span>
-          <span>de la cola muestran</span> <span>cuántos</span> <span>mensajes</span>
-          <span>están en</span> <span>la cola</span> <span>para su entrega a</span>
-          <span>otros hubs</span><span>.</span> <span class="">La prioridad</span>
-          <span>está relacionada con</span> <span>la cantidad de veces</span>
-          que <span>la entrega</span> <span>se ha intentado</span><span>, sin
-            éxito</span><span>.</span></span></dd>
+      <dd>Las estadísticas de la cola muestran cuántos mensajes están en la cola para su entrega a otros hubs. La prioridad está relacionada con la cantidad de veces que la entrega se ha intentado, sin éxito.</dd>
     </dl>
-  </body>
-</html>
diff --git a/doc/context/es/admin/security/help.html b/doc/context/es/admin/security/help.html
index 8817636ed..229a91561 100644
--- a/doc/context/es/admin/security/help.html
+++ b/doc/context/es/admin/security/help.html
@@ -1,17 +1,4 @@
-<html>
-  <head>
-    <meta content="text/html; charset=windows-1252" http-equiv="content-type">
-  </head>
-  <body>
     <dl class="dl-horizontal">
       <dt>General</dt>
-      <dd><span id="result_box" class="" lang="es"><span>Esta página</span> <span>contiene</span>
-          <span class="">varios ajustes</span> </span><span id="result_box" class=""
-          lang="es"><span>para el administrador</span> </span><span id="result_box"
-          class="" lang="es"><span class="">relacionados con la seguridad</span>.
-          <span>Para</span> <span class="">guardar los cambios que</span> <span
-            class="">realice en</span> <span>estos ajustes</span><span>, debe
-            pulsar</span> <span class="">el botón Enviar.</span></span></dd>
+      <dd>Esta página contiene varios ajustes para el administrador relacionados con la seguridad. Para guardar los cambios que realice en estos ajustes, debe pulsar el botón "Enviar".</dd>
     </dl>
-  </body>
-</html>
diff --git a/doc/context/es/channel/help.html b/doc/context/es/channel/help.html
index 3d925241d..682125e27 100644
--- a/doc/context/es/channel/help.html
+++ b/doc/context/es/channel/help.html
@@ -1,35 +1,8 @@
-<html>
-  <head>
-    <meta content="text/html; charset=windows-1252" http-equiv="content-type">
-  </head>
-  <body>
-    <dl class="dl-horizontal">
-      <dt>General</dt>
-      <dd><span id="result_box" class="" lang="es"><span>Esta</span> <span>es
-            la</span> <span>página principal de un</span> <span>canal.</span>
-          <span>Es similar</span> <span>al "muro" del perfil </span><span></span><span></span><span></span>
-          <span>de una persona</span> <span>en un contexto</span> de <span>red
-            social</span><span>.</span> <span>Las entradas</span> <span>creadas
-            por</span> <span>el canal</span> <span>se</span> <span>muestran
-            de acuerdo con</span> <span>los permisos de visualización</span> <span
-            class="">del observador</span><span>.</span></span></dd>
-      <dt>Crear una entrada</dt>
-      <dd><span id="result_box" class="" lang="es"><span>Si tiene permiso</span>
-          <span>para crear</span> <span>entradas en</span> <span>la página del
-            canal</span><span>,</span> <span>a continuación,</span> <span>podrá
-            ver el</span> <span>editor de entradas</span> <span>en la parte
-            superior</span><span class="">.</span></span></dd>
-      <dt><a href="#" onclick='contextualHelpFocus("#tabs-collapse-1", 0); return false;'
-          title="Pulsar sobre el elemento resaltado...">Pestañas de los
-          contenidos del canal</a></dt>
-      <dd><span id="result_box" class="" lang="es"><span>Las</span> <span>pestañas</span>
-          <span>de los contenidos</span> <span>del canal</span> <span>son</span>
-          <span>enlaces a otros contenidos</span> <span>publicados por el</span>
-          <span>canal.</span> La pestaña "<span style="font-weight: bold;">Mi
-            perfil</span>" enlaza con el perfil del canal. La pestaña "<span style="font-weight: bold;">Fotos</span>"
-          enlaza con las galerías de fotos. La pestaña "<span style="font-weight: bold;">Ficheros</span>"
-          enlaza con los ficheros de cualquier tipo compartidos por el canal.<span
-            class=""></span></span></dd>
-    </dl>
-  </body>
-</html>
+<dt>General</dt>
+<dd>Esta es la página principal de un canal. Es similar al "muro" del perfil de una persona en un contexto de red social. Las entradas creadas por el canal se muestran de acuerdo con los permisos de visualización
+del observador.</dd>
+<dt>Crear una entrada</dt>
+<dd>Si tiene permiso para crear entradas en la página del canal, a continuación, podrá ver el editor de entradas en la parte superior.</dd>
+<dt><a href="#" onclick="contextualHelpFocus(&quot;#tabs-collapse-1&quot;, 0); return false;">Pestañas de los contenidos del canal</a></dt>
+<dd>Las pestañas de los contenidos del canal son enlaces a otros contenidos publicados por el canal. La pestaña "<b>Mi perfil</b>" enlaza con el perfil del canal. La pestaña "<b>Fotos</b>" enlaza con las galerías
+de fotos. La pestaña "<b>Ficheros</b>" enlaza con los ficheros de cualquier tipo compartidos por el canal.</dd>
\ No newline at end of file
diff --git a/doc/context/es/chat/help.html b/doc/context/es/chat/help.html
index 805f7b87a..94df6a1d2 100644
--- a/doc/context/es/chat/help.html
+++ b/doc/context/es/chat/help.html
@@ -1,30 +1,8 @@
-<html>
-  <head>
-    <meta content="text/html; charset=windows-1252" http-equiv="content-type">
-  </head>
-  <body>
     <dl class="dl-horizontal">
       <dt>General</dt>
-      <dd><span id="result_box" class="" lang="es"><span>Creación y uso de</span>
-          <span>salas de chat para</span> <span>comunicarse en tiempo</span> <span>real,
-            utilizando</span> <span class="">el sistema de</span> <span>permisos</span>
-          <span>Hubzilla</span> <span>estándar para el</span> <span>control de
-            acceso a</span> <span class="">la sala de chat</span><span>.</span></span></dd>
-      <dt>Create una nueva sala de chat</dt>
-      <dd><span id="result_box" class="" lang="es"><span>Utilice</span> <span>el
-            botón</span> <span>"</span><span class="">Crear" para</span> <span>crear
-            una nueva</span> <span class="">sala de chat</span><span>.</span> <span
-            class="">Introduzca un nombre y</span> <span class="">cuánto tiempo
-            se deben conservar los mensajes.</span><span class=""></span></span></dd>
+      <dd>Creación y uso de salas de chat para comunicarse en tiempo real, utilizando el sistema de permisos estándar de Hubzilla para el control de acceso a la sala de chat.</dd>
+      <dt>Crear una nueva sala de chat</dt>
+      <dd>Utilice el botón "Crear" para crear una nueva sala de chat. Introduzca un nombre y cuánto tiempo se deben conservar los mensajes.</dd>
       <dt>Chatear</dt>
-      <dd><span id="result_box" class="" lang="es"><span>Introduzca su mensaje
-            en</span> <span>el cuadro de mensaje</span> <span>y pulse</span> <span>"Enviar".</span>
-          <span>Se puede establecer un</span> <span>estado</span> <span>seleccionando
-            el</span> <span>botón de menú</span> <span>sala de chat</span> <span>junto
-            al botón</span> <span>Enviar.</span> <span>Si hay otras personas</span>
-          <span>"en la sala</span><span>",</span> <span>serán visibles en</span>
-          <span>el panel lateral</span>, <span>en</span><span></span> <span>"</span><span
-            class="">Miembros del chat</span><span>"</span><span class="">.</span></span></dd>
+      <dd>Introduzca su mensaje en el cuadro de mensaje y pulse "Enviar". Se puede establecer un estado seleccionando el botón de menú sala de chat junto al botón "Enviar". Si hay otras personas en la sala, serán visibles en el panel lateral, en "Miembros del chat".</dd>
     </dl>
-  </body>
-</html>
diff --git a/doc/context/es/cloud/help.html b/doc/context/es/cloud/help.html
index 474918e81..824fa5a94 100644
--- a/doc/context/es/cloud/help.html
+++ b/doc/context/es/cloud/help.html
@@ -1,30 +1,7 @@
-<html>
-  <head>
-    <meta content="text/html; charset=windows-1252" http-equiv="content-type">
-  </head>
-  <body>
     <dl class="dl-horizontal">
       <dt>General</dt>
-      <dd><span id="result_box" class="" lang="es"><span>Esta página</span> <span>muestra
-            los ficheros en la</span> <span>"nube"</span> <span>de un canal</span><span>.</span>
-          <span>Los</span> <span>archivos visibles</span> <span>para el
-            observador</span> <span>dependen de</span> <span>los permisos de
-            archivo</span> <span>individuales</span> <span>establecidas por</span>
-          <span>el propietario del canal</span><span>.</span> <span>Si tiene
-            permiso</span> <span>para crear</span> <span>o</span> <span>cargar
-            ficheros,</span> <span>verá</span> <span>botones de control</span>
-          <span>por encima de la</span> <span class="">lista de ficheros.</span></span></dd>
-      <dt><a href="#" onclick='contextualHelpFocus("#tabs-collapse-1", 0); return false;'
-          title="Pulsar en el elemento resaltado...">Pestañas de los contenidos
-          del canal<br>
-        </a></dt>
-      <dd><span id="result_box" class="" lang="es"><span>Las</span> <span>pestañas</span>
-          <span>de los contenidos</span> <span>del canal</span> <span>son</span>
-          <span>enlaces a otros contenidos</span> <span>publicados por el</span>
-          <span>canal.</span> La pestaña "<span style="font-weight: bold;">Mi
-            perfil</span>" enlaza con el perfil del canal. La pestaña "<span style="font-weight: bold;">Fotos</span>"
-          enlaza con las galerías de fotos. La pestaña "Ficheros" enlaza con los
-          ficheros de cualquier tipo compartidos por el canal.</span></dd>
+      <dd>Esta página muestra los ficheros en la "nube" de un canal. Los archivos visibles para el observador dependen de los permisos de archivo individuales establecidas por
+          el propietario del canal. Si tiene permiso para crear o cargar ficheros, verá botones de control por encima de la lista de ficheros.</dd>
+      <dt><a href="#" onclick='contextualHelpFocus("#tabs-collapse-1", 0); return false;' title="Pulsar en el elemento resaltado...">Pestañas de los contenidos del canal</a></dt>
+      <dd>Las pestañas de los contenidos del canal son enlaces a otros contenidos publicados por el canal. La pestaña "<b>Mi perfil</b>" enlaza con el perfil del canal. La pestaña "<b>Fotos</b>" enlaza con las galerías de fotos. La pestaña "<b>Ficheros</b>" enlaza con los ficheros de cualquier tipo compartidos por el canal.</dd>
     </dl>
-  </body>
-</html>
diff --git a/doc/context/es/connections/help.html b/doc/context/es/connections/help.html
index 0f95fde63..a0aa9cf32 100644
--- a/doc/context/es/connections/help.html
+++ b/doc/context/es/connections/help.html
@@ -1,8 +1,15 @@
-<dl class="dl-horizontal">
-    <dt>General</dt>
-    <dd>This page displays a list of all this channel's connections. The list can be <a href='#' onclick='contextualHelpFocus(".section-title-wrapper", 0); return false;' title="Click to highlight element...">sorted and filtered using the menu button beside the search button</a>. </dd>
-    <dt>Connection Details</dt>
-    <dd>Each list entry shows the details of a specific connection. A translucent avatar image indicates an archived connection.</dd>
-    <dt>Connection Status</dt>
-    <dd>A connection can be in different states: <ul><li>Archived</li><li>Ignored</li><li>Blocked</li><li>Hidden</li></ul></dd>
-</dl>
\ No newline at end of file
+    <dl class="dl-horizontal">
+      <dt>General</dt>
+      <dd>Esta página muestra una lista de todas las conexiones de este canal. La lista se puede <a href="#" onclick='contextualHelpFocus(".section-title-wrapper", 0); return false;' title="Pulsar sobre el elemento resaltado...">ordenar y filtrar usando  el botón de menú al lado del botón de búsqueda</a>.</dd>
+      <dt>Detalles de la conexión</dt>
+      <dd>Cada entrada de la lista muestra los detalles de una conexión específica. Una imagen de avatar translúcida indica una conexión archivada.</dd>
+      <dt>Estado de la conexión</dt>
+      <dd>Una conexión puede estar en diferentes estados:
+        <ul>
+          <li>Archivada</li>
+          <li>Ignorada</li>
+          <li>Bloqueada</li>
+          <li>Oculta</li>
+        </ul>
+      </dd>
+    </dl>
diff --git a/doc/context/es/connections/ifpending/help.html b/doc/context/es/connections/ifpending/help.html
index 5fb0f3a0a..84e547851 100644
--- a/doc/context/es/connections/ifpending/help.html
+++ b/doc/context/es/connections/ifpending/help.html
@@ -1,24 +1,10 @@
-<html>
-  <head>
-    <meta content="text/html; charset=windows-1252" http-equiv="content-type">
-  </head>
-  <body>
     <dl class="dl-horizontal">
       <dt>General</dt>
-      <dd><span id="result_box" class="" lang="es"><span>Esta página</span> <span>muestra
-            una lista de</span> <span>todas</span> <span>las conexiones</span>
-          <span class="">de este canal</span><span class="">.</span> <span class="">La</span>
-          <span class="">lista se puede&nbsp;</span></span><a href="#" onclick='contextualHelpFocus(".section-title-wrapper", 0); return false;'
-          title="Pulsar sobre el elemento resaltado...">ordenar y filtrar usando
-          el botón de menú al lado del botón de búsqueda</a>. </dd>
-      <dt>Detalles de la conexión</dt>
-      <dd><span id="result_box" class="" lang="es"><span>Cada</span> <span>entrada
-            de la lista</span> <span>muestra los</span> <span>detalles de una
-            conexión</span> <span>específica</span><span>.</span> <span>Una</span>
-          <span>imagen de avatar</span> <span>translúcida</span> <span>indica
-            una conexión</span> <span class="">archivada.</span></span></dd>
-      <dt>Estado de la conexión</dt>
-      <dd>Una conexión puede estar en diferentes estados:
+      <dd>Esta página muestra una lista de todas las conexiones de este canal. La lista se puede&nbsp;<a href="#" onclick='contextualHelpFocus(".section-title-wrapper", 0); return false;' title="Pulsar sobre el elemento resaltado...">ordenar y filtrar usando el botón de menú al lado del botón de búsqueda</a>. </dd>
+      <dt>Detalles de la conexión</dt>
+      <dd>Cada entrada de la lista muestra los detalles de una conexión específica. Una imagen de avatar translúcida indica una conexión archivada.</dd>
+      <dt>Estado de la conexión</dt>
+      <dd>Una conexión puede estar en diferentes estados:
         <ul>
           <li>Archivada</li>
           <li>Ignorada</li>
@@ -27,5 +13,3 @@
         </ul>
       </dd>
     </dl>
-  </body>
-</html>
diff --git a/doc/context/es/events/help.html b/doc/context/es/events/help.html
index 681f72e89..b0ac1f9ea 100644
--- a/doc/context/es/events/help.html
+++ b/doc/context/es/events/help.html
@@ -1,23 +1,8 @@
-<html>
-  <head>
-    <meta content="text/html; charset=windows-1252" http-equiv="content-type">
-  </head>
-  <body>
     <dl class="dl-horizontal">
       <dt>General</dt>
-      <dd><span id="result_box" class="" lang="es"><span>Esta página</span> <span>muestra
-            un calendario</span> <span>de eventos tanto</span> <span>de su
-            propiedad como</span> <span class="">compartido con usted</span> <span
-            class="">desde otros canales.</span></span></dd>
-      <dt><a href="#" onclick='contextualHelpFocus("#title", 0); return false;'
-          title="Pulsar en el elemento resaltado...">Vistas del calendario</a></dt>
-      <dd><span id="result_box" class="" lang="es"><span>El calendario</span> <span>se
-            puede mostrar en</span> <span>modo mensual</span><span>, semanal o</span>
-          diario<span> usando</span> <span>las opciones del</span> <span class="">panel
-            lateral</span><span class="">.</span></span></dd>
+      <dd>Esta página muestra un calendario de eventos tanto de su propiedad como compartido con usted desde otros canales.</dd>
+      <dt><a href="#" onclick='contextualHelpFocus("#title", 0); return false;' title="Pulsar en el elemento resaltado...">Vistas del calendario</a></dt>
+      <dd>El calendario se puede mostrar en modo mensual, semanal o diario usando las opciones del panel lateral.</dd>
       <dt>Exportar/Importar</dt>
-      <dd>Exportar o importar eventos del calendario usando el formato estándar
-        de los ficheros de iCalendar (.ics).</dd>
+      <dd>Exportar o importar eventos del calendario usando el formato estándar de los ficheros de iCalendar (.ics).</dd>
     </dl>
-  </body>
-</html>
diff --git a/doc/context/es/mail/help.html b/doc/context/es/mail/help.html
index e51f7225c..794af38a9 100644
--- a/doc/context/es/mail/help.html
+++ b/doc/context/es/mail/help.html
@@ -1,38 +1,10 @@
-<html>
-  <head>
-    <meta content="text/html; charset=windows-1252" http-equiv="content-type">
-  </head>
-  <body>
     <dl class="dl-horizontal">
       <dt>General</dt>
-      <dd><span id="result_box" class="" lang="es"><span>Los mensajes que
-            aparecen</span> <span>en</span> <span>el correo privado</span> <span>son</span>
-          <span>visibles sólo para</span> <span>usted y un</span> <span class="">único
-            destinatario.</span></span></dd>
+      <dd>Los mensajes que aparecen en el correo privado son visibles sólo para usted y un único destinatario.</dd>
       <dt>Vista combinada</dt>
-      <dd><span id="result_box" class="" lang="es"><span>Las conversaciones</span>
-          <span>completas</span> <span>se pueden ver en</span> <span>un hilo
-            continuo</span> <span>seleccionando</span><span></span> "<span><span
-              style="font-weight: bold;">Vista combinada</span>"</span><span>.</span>
-          <span>Las conversaciones</span> <span>disponibles se muestran</span>
-          <span>debajo del menú</span> <span>en el</span> <span class="">panel
-            lateral</span><span class="">.</span></span></dd>
+      <dd>Las conversaciones completas se pueden ver en un hilo continuo seleccionando "<b>Vista combinada</b>". Las conversaciones disponibles se muestran debajo del menú en el panel lateral.</dd>
       <dt>Bandeja de entrada/Bandeja de salida</dt>
-      <dd>Los mensajes individuales enviados son visibles seleccionando la <span
-          style="font-weight: bold;">Bandeja de salida</span> y los mensajes
-        recibidos se pueden ver usando el filtro de la <span style="font-weight: bold;">Bandeja
-          de entrada</span>.<br>
-      </dd>
+      <dd>Los mensajes individuales enviados son visibles seleccionando la <b>Bandeja de salida</b> y los mensajes recibidos se pueden ver usando el filtro de la <b>Bandeja de entrada.</b></dd>
       <dt>Mensaje nuevo</dt>
-      <dd><span id="result_box" class="" lang="es"><span>Los mensajes
-            individuales</span> <span>tienen</span> <span>informes de entrega</span>
-          <span>que se pueden ver</span> <span>usando</span> <span>el menú</span>
-          <span>desplegable.</span> <span>Los mensajes también</span> <span>se
-            pueden revocar</span> <span>desde el mismo menú</span><span>, lo
-            que puede</span> <span>evitar que el destinatario</span> <span>vea
-            el mensaje</span><span>, <span style="font-style: italic;">si</span></span><span
-            style="font-style: italic;"> <span>aún no lo ha</span> </span><span
-            class=""><span style="font-style: italic;">leído</span>.</span></span></dd>
-    </dl>
-  </body>
-</html>
+      <dd>Los mensajes individuales tienen informes de entrega que se pueden ver usando el menú desplegable. Los mensajes también se pueden revocar desde el mismo menú, lo que puede evitar que el destinatario vea el mensaje, <i>si aún no lo ha leído</i>.</dd>
+    </dl>
\ No newline at end of file
diff --git a/doc/context/es/network/help.html b/doc/context/es/network/help.html
index 00b25428c..082f52a49 100644
--- a/doc/context/es/network/help.html
+++ b/doc/context/es/network/help.html
@@ -1,71 +1,12 @@
-<html>
-  <head>
-    <meta content="text/html; charset=windows-1252" http-equiv="content-type">
-  </head>
-  <body>
     <dl class="dl-horizontal">
       <dt>General</dt>
-      <dd><span id="result_box" class="" lang="es"><span>La</span> <span>página
-            de</span> <span>Mi red muestra</span> <span>un flujo</span> <span>de</span>
-          <span>entradas</span> <span>y conversaciones</span><span>,</span> <span>normalmente</span>
-          <span>ordenadas según la</span> <span>actualización más reciente</span><span>.</span>
-          <span>Esta página</span> <span>es</span> <span>altamente
-            personalizable</span><span class="">.</span></span></dd>
-      <dt><a href="#" onclick='contextualHelpFocus("#profile-jot-wrapper", 0); return false;'
-          title="Pulsar sobre el elemento resaltado...">Crear una entrada<br>
-        </a></dt>
-      <dd><span id="result_box" class="" lang="es"><span>En la parte superior</span>
-          <span>de la</span> <span>página hay un</span> <span>cuadro de texto
-            que</span> <span>dice</span> <span>"</span><span style="font-weight: bold;">Compartir</span><span>"</span><span>.</span>
-          <span>Al hacer clic en</span> <span>esta casilla</span> <span>se
-            abre</span> <span>un nuevo</span> <span>editor de entradas</span><span>.</span>
-          <span>El</span> <span>editor de entradas</span> <span>es
-            personalizable</span><span>,</span> <span>pero el</span> <span>editor
-            básico</span> <span>proporciona</span> <span>campos para</span> <span>el
-            cuerpo de la publicación y un</span><span></span> <span>título</span>
-          <span>opcional.</span> <span>Los botones que hay debajo de la</span>
-          <span>zona de</span> <span>texto, a la izquierda,</span> <span>proporcionan</span>
-          <span>accesos directos para el</span> <span><span style="font-weight: bold;">Formato</span>
-            de texto</span> <span>y para&nbsp; insertar</span> <span>enlaces</span><span>,
-            imágenes y</span> <span>otros</span> <span>datos en</span> <span>la
-            entrada</span><span>.</span> <span>Los</span> <span>botones a la
-            derecha</span> <span>proporcionan una</span> <span class="">vista
-            previa del</span> <span class="">mensaje</span><span class="">,</span>
-          <span>los ajustes</span><span> de permisos</span> <span>de la entrada</span><span>,</span>
-          <span>y</span> <span>un botón <span style="font-weight: bold;">Enviar</span></span>
-          <span>para publicarla</span><span></span><span>.</span></span></dd>
-      <dt><a href="#" onclick='contextualHelpFocus("#group-sidebar", 1); return false;'
-          title="Pulsar sobre el elemento resaltado...">Grupos de canales<br>
-        </a></dt>
-      <dd><span id="result_box" class="" lang="es"><span>Los</span> <span>grupos
-            de canales</span> <span>que ha creado</span> <span>se muestran en
-            el</span> <span>panel lateral</span><span>.</span> <span class="">Seleccionándolos,
-            se</span><span class=""> filtran</span> <span class="">las entradas</span>
-          <span></span><span>creadas por</span> <span>los canales incluidos en
-            el</span> <span>grupo elegido</span><span class="">.</span></span></dd>
-      <dt><a href="#" onclick='$("#dbtn-acl").click(); return false;' title="Pulsar sobre el elemento resaltado...">Permisos
-          de una entrada<br>
-        </a></dt>
-      <dd><span id="result_box" class="" lang="es"><span>La lista</span> <span>de
-            control de acceso</span> <span>(</span><span>ACL) es</span> <span>lo
-            que se utiliza</span> <span>para establecer</span> <span>quién
-            puede ver su</span> <span>nueva entrada</span><span>.</span> <span>Al
-            pulsar el</span> <span>botón ACL</span>, <span>al lado del</span>
-          <span>botón Enviar,</span> <span>se mostrará</span> <span>un cuadro
-            de diálogo</span> <span>en</span> <span>el que puede seleccionar</span>
-          <span>qué canales</span> <span>y /</span> <span>o</span> <span>grupos
-            de canales</span> <span>pueden ver el</span> <span>mensaje</span><span>.</span>
-          <span>También puede seleccionar</span> <span>a quién se le niega</span>
-          <span>el acceso explícitamente</span><span>.</span> <span>Por ejemplo</span><span>,
-            digamos que usted</span> <span>está planeando</span> <span>una
-            fiesta sorpresa para</span> <span>un amigo</span><span>.</span> <span>Puede
-            enviar un</span> <span>mensaje</span> <span>de invitación</span> <span>a</span>
-          <span>todos los miembros de</span> <span>su grupo de</span> <span style="font-weight: bold;">Amigos</span><span>,
-            excepto el</span> <span>amigo al que quiere sorprender</span><span
-            class="">.</span> <span class="">En este caso,</span> <span>"se
-            mostrará"&nbsp;</span> <span>al grupo de</span> <span>amigos, pero</span>
-          <span>"</span><span>no se mostrará</span><span>"</span> <span>a esa
-            única</span><span class=""> persona.</span></span></dd>
+      <dd>La página de "Mi red" muestra un flujo de entradas y conversaciones, normalmente ordenadas según la actualización más reciente. Esta página es altamente personalizable.</dd>
+      <dt><a href="#" onclick='contextualHelpFocus("#profile-jot-wrapper", 0); return false;' title="Pulsar sobre el elemento resaltado...">Crear una entrada</a></dt>
+      <dd>En la parte superior de la página hay un cuadro de texto que dice "<b>Compartir</b>". Al hacer clic en esta casilla se abre un nuevo editor de entradas. El editor de entradas es personalizable, pero el editor básico proporciona campos para el cuerpo de la publicación y un título opcional. Los botones que hay debajo de la zona de texto, a la izquierda, proporcionan
+          accesos directos para el <b>Formato</b> de texto y para&nbsp; insertar enlaces, imágenes y otros datos en la entrada. Los botones a la derecha proporcionan una vista previa del mensaje, los ajustes de permisos de la entrada, y un botón <b>Enviar</b> para publicarla.</dd>
+      <dt><a href="#" onclick='contextualHelpFocus("#group-sidebar", 1); return false;' title="Pulsar sobre el elemento resaltado...">Grupos de canales</a></dt>
+      <dd>Los grupos de canales que ha creado se muestran en el panel lateral. Seleccionándolos, se filtran las entradas creadas por los canales incluidos en el grupo elegido.</dd>
+      <dt><a href="#" onclick='$("#dbtn-acl").click(); return false;' title="Pulsar sobre el elemento resaltado...">Permisos de una entrada</a></dt>
+      <dd>La lista de control de acceso (ACL) es lo que se utiliza para establecer quién puede ver su nueva entrada. Al pulsar el botón ACL, al lado del botón Enviar, se mostrará un cuadro de diálogo en el que puede seleccionar qué canales y / o grupos de canales pueden ver el mensaje. También puede seleccionar a quién se le niega el acceso explícitamente. Por ejemplo,di gamos que usted está planeando una
+            fiesta sorpresa para un amigo. Puede enviar un mensaje de invitación a todos los miembros de su grupo de <b>Amigos</b>, excepto el amigo al que quiere sorprender. En este caso, "se mostrará" al grupo de amigos, pero "no se mostrará" a esa única persona.</dd>
     </dl>
-  </body>
-</html>
diff --git a/doc/context/es/photos/help.html b/doc/context/es/photos/help.html
index 44d0bed15..6623456eb 100644
--- a/doc/context/es/photos/help.html
+++ b/doc/context/es/photos/help.html
@@ -1,27 +1,6 @@
-<html>
-  <head>
-    <meta content="text/html; charset=windows-1252" http-equiv="content-type">
-  </head>
-  <body>
     <dl class="dl-horizontal">
       <dt>General</dt>
-      <dd><span id="result_box" class="" lang="es"><span>Esta página</span> <span>muestra</span>
-          <span class="">los álbumes de fotos</span> <span class="">de un canal</span><span>.</span>
-          <span>Las</span> <span>imágenes visibles</span> <span class="">para
-            el observador</span> <span class="">dependen de</span> <span class="">los
-            permisos</span> <span class="">individuales de cada imagen</span><span
-            class="">.</span></span></dd>
-      <dt><a href="#" onclick='contextualHelpFocus("#tabs-collapse-1", 0); return false;'
-          title="Pulsar sobre el elemento resaltado...">Pestañas de los
-          contenidos del canal<br>
-        </a></dt>
-      <dd><span id="result_box" class="" lang="es"><span>Las</span> <span>pestañas</span>
-          <span>de los contenidos</span> <span>del canal</span> <span>son</span>
-          <span>enlaces a otros contenidos</span> <span>publicados por el</span>
-          <span>canal.</span> La pestaña "<span style="font-weight: bold;">Mi
-            perfil</span>" enlaza con el perfil del canal. La pestaña "<span style="font-weight: bold;">Fotos</span>"
-          enlaza con las galerías de fotos. La pestaña "<span style="font-weight: bold;">Ficheros</span>"
-          enlaza con los ficheros de cualquier tipo compartidos por el canal.</span></dd>
+      <dd>Esta página muestra los álbumes de fotos de un canal. Las imágenes visibles para el observador dependen de los permisos individuales de cada imagen.</dd>
+      <dt><a href="#" onclick='contextualHelpFocus("#tabs-collapse-1", 0); return false;' title="Pulsar sobre el elemento resaltado...">Pestañas de los contenidos del canal</a></dt>
+<dd>Las pestañas de los contenidos del canal son enlaces a otros contenidos publicados por el canal. La pestaña "<b>Mi perfil</b>" enlaza con el perfil del canal. La pestaña "<b>Fotos</b>" enlaza con las galerías de fotos. La pestaña "<b>Ficheros</b>" enlaza con los ficheros de cualquier tipo compartidos por el canal.</dd>
     </dl>
-  </body>
-</html>
diff --git a/doc/context/es/profile/help.html b/doc/context/es/profile/help.html
index 314552f9b..28ff22499 100644
--- a/doc/context/es/profile/help.html
+++ b/doc/context/es/profile/help.html
@@ -1,32 +1,6 @@
-<html>
-  <head>
-    <meta content="text/html; charset=windows-1252" http-equiv="content-type">
-  </head>
-  <body>
     <dl class="dl-horizontal">
       <dt>General</dt>
-      <dd><span id="result_box" class="" lang="es"><span>Esta</span> <span>es
-            la página de</span> <span>perfil</span> <span>de un canal</span><span>.</span>
-          <span>Por lo general</span> <span>muestra</span> la <span>información
-            que describe el</span> <span>canal.</span> <span>Si el canal</span>
-          <span>representa a una persona</span> <span>en una red social</span><span>,
-            por ejemplo</span><span>, el perfil</span> <span>podría
-            proporcionar</span> <span>información de contacto y</span> <span>otros</span>
-          <span>datos personales</span><span></span><span>.</span> <span>Los
-            canales pueden</span> <span>tener varios perfiles</span><span>,</span>
-          <span>en cuyo caso el</span> <span>perfil que se muestra</span> <span
-            class="">depende del observador</span><span>.</span></span></dd>
-      <dt><a href="#" onclick='contextualHelpFocus("#tabs-collapse-1", 0); return false;'
-          title="Pulsar sobre el elemento resaltado...">Pestañas de los
-          contenidos del canal<br>
-        </a></dt>
-      <dd><span id="result_box" class="" lang="es"><span>Las</span> <span>pestañas</span>
-          <span>de los contenidos</span> <span>del canal</span> <span>son</span>
-          <span>enlaces a otros contenidos</span> <span>publicados por el</span>
-          <span>canal.</span> La pestaña "<span style="font-weight: bold;">Mi
-            perfil</span>" enlaza con el perfil del canal. La pestaña "<span style="font-weight: bold;">Fotos</span>"
-          enlaza con las galerías de fotos. La pestaña "<span style="font-weight: bold;">Ficheros</span>"
-          enlaza con los ficheros de cualquier tipo compartidos por el canal.</span></dd>
+      <dd>Esta es la página de perfil de un canal. Por lo general muestra la información que describe el canal. Si el canal representa a una persona en una red social, por ejemplo, el perfil podría proporcionar información de contacto y otros datos personales. Los canales pueden tener varios perfiles, en cuyo caso el perfil que se muestra depende del observador.</dd>
+      <dt><a href="#" onclick='contextualHelpFocus("#tabs-collapse-1", 0); return false;' title="Pulsar sobre el elemento resaltado...">Pestañas de los contenidos del canal</a></dt>
+      <dd>Las pestañas de los contenidos del canal son enlaces a otros contenidos publicados por el canal. La pestaña "Mi perfil" enlaza con el perfil del canal. La pestaña "Fotos" nlaza con las galerías de fotos. La pestaña "Ficheros" enlaza con los ficheros de cualquier tipo compartidos por el canal.</dd>
     </dl>
-  </body>
-</html>
diff --git a/include/Contact.php b/include/Contact.php
index e011c60c8..8ad67c28e 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -389,7 +389,7 @@ function channel_remove($channel_id, $local = true, $unset_session=false) {
 	proc_run('php','include/directory.php',$channel_id);
 
 	if($channel_id == local_channel() && $unset_session) {
-		\Zotlabs\Web\Session::nuke();
+		App::$session->nuke();
 		goaway(z_root());
 	}
 
diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index ce0a32798..136f8aa50 100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -271,7 +271,8 @@ function populate_acl($defaults = null,$show_jotnets = true, $emptyACL_descripti
 		'$showall'         => $showall_caption,
 		'$showallOrigin'   => $showall_origin,
 		'$showallIcon'     => $showall_icon,
-		'$showlimited'     => t("Limit access:"),
+		'$select_label'    => t('Who can see this'),
+		'$showlimited'     => t('Custom selection'),
 		'$showlimitedDesc' => t('Select "Show" to allow viewing. "Don\'t show" lets you override and limit the scope of "Show".'),
 		'$show'	           => t("Show"),
 		'$hide'	           => t("Don't show"),
diff --git a/include/api.php b/include/api.php
index 3b2c71923..5f4d4bedb 100644
--- a/include/api.php
+++ b/include/api.php
@@ -486,7 +486,7 @@ require_once('include/api_auth.php');
 
 	function api_account_logout(&$a, $type){
 		require_once('include/auth.php');
-		\Zotlabs\Web\Session::nuke();
+		App::$session->nuke();
 		return api_apply_template("user", $type, array('$user' => null));
 
 	}
diff --git a/include/auth.php b/include/auth.php
index 9643da8eb..01fcf0094 100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -101,7 +101,7 @@ if((isset($_SESSION)) && (x($_SESSION, 'authenticated')) &&
 		// process logout request
 		$args = array('channel_id' => local_channel());
 		call_hooks('logging_out', $args);
-		\Zotlabs\Web\Session::nuke();
+		App::$session->nuke();
 		info( t('Logged out.') . EOL);
 		goaway(z_root());
 	}
@@ -117,7 +117,7 @@ if((isset($_SESSION)) && (x($_SESSION, 'authenticated')) &&
 				intval(ACCOUNT_ROLE_ADMIN)
 			);
 			if($x) {
-				\Zotlabs\Web\Session::new_cookie(60 * 60 * 24); // one day
+				App::$session->new_cookie(60 * 60 * 24); // one day
 				$_SESSION['last_login_date'] = datetime_convert();
 				unset($_SESSION['visitor_id']); // no longer a visitor
 				authenticate_success($x[0], true, true);
@@ -141,7 +141,7 @@ if((isset($_SESSION)) && (x($_SESSION, 'authenticated')) &&
 
 	if(x($_SESSION, 'uid') || x($_SESSION, 'account_id')) {
 
-		Zotlabs\Web\Session::return_check();
+		App::$session->return_check();
 
 		$r = q("select * from account where account_id = %d limit 1",
 			intval($_SESSION['account_id'])
@@ -155,14 +155,14 @@ if((isset($_SESSION)) && (x($_SESSION, 'authenticated')) &&
 			}
 			if(strcmp(datetime_convert('UTC','UTC','now - 12 hours'), $_SESSION['last_login_date']) > 0 ) {
 				$_SESSION['last_login_date'] = datetime_convert();
-				Zotlabs\Web\Session::extend_cookie();
+				App::$session->extend_cookie();
 				$login_refresh = true;
 			}
 			authenticate_success($r[0], false, false, false, $login_refresh);
 		}
 		else {
 			$_SESSION['account_id'] = 0;
-			\Zotlabs\Web\Session::nuke();
+			App::$session->nuke();
 			goaway(z_root());
 		}
 	} // end logged in user returning
@@ -170,7 +170,7 @@ if((isset($_SESSION)) && (x($_SESSION, 'authenticated')) &&
 else {
 
 	if(isset($_SESSION)) {
-		\Zotlabs\Web\Session::nuke();
+		App::$session->nuke();
 	}
 
 	// handle a fresh login request
@@ -242,11 +242,11 @@ else {
 
 		if($_POST['remember_me']) {
 			$_SESSION['remember_me'] = 1;
-			\Zotlabs\Web\Session::new_cookie(31449600); // one year
+			App::$session->new_cookie(31449600); // one year
 		}
 		else {
 			$_SESSION['remember_me'] = 0;
-			\Zotlabs\Web\Session::new_cookie(0); // 0 means delete on browser exit
+			App::$session->new_cookie(0); // 0 means delete on browser exit
 		}
 
 		// if we haven't failed up this point, log them in.
diff --git a/include/cli_startup.php b/include/cli_startup.php
index a99164d4c..a33f7acb0 100644
--- a/include/cli_startup.php
+++ b/include/cli_startup.php
@@ -30,7 +30,8 @@ function cli_startup() {
     	unset($db_host, $db_port, $db_user, $db_pass, $db_data, $db_type);
   	};
 
-	\Zotlabs\Web\Session::init();
+	App::$session = new Zotlabs\Web\Session();
+	App::$session->init();
 
 	load_config('system');
 
diff --git a/include/dba/dba_driver.php b/include/dba/dba_driver.php
index 8e205a4aa..4a1752672 100755
--- a/include/dba/dba_driver.php
+++ b/include/dba/dba_driver.php
@@ -25,23 +25,31 @@ function dba_factory($server, $port,$user,$pass,$db,$dbtype,$install = false) {
 	$dba = null;
 
 	$dbtype = intval($dbtype);
+	$set_port = $port;
 
 	if($dbtype == DBTYPE_POSTGRES) {
 		require_once('include/dba/dba_postgres.php');
-		if(is_null($port)) $port = 5432;
-		$dba = new dba_postgres($server, $port, $user, $pass, $db, $install);
+		if(is_null($port)) $set_port = 5432;
+		$dba = new dba_postgres($server, $set_port, $user, $pass, $db, $install);
 	} else {
 		if(class_exists('mysqli')) {
-			if (is_null($port)) $port = ini_get("mysqli.default_port");
+			if (is_null($port)) $set_port = ini_get("mysqli.default_port");
 			require_once('include/dba/dba_mysqli.php');
-			$dba = new dba_mysqli($server, $port,$user,$pass,$db,$install);
+			$dba = new dba_mysqli($server, $set_port,$user,$pass,$db,$install);
 		} else {
-			if (is_null($port)) $port = "3306";
+			if (is_null($port)) $set_port = "3306";
 			require_once('include/dba/dba_mysql.php');
-			$dba = new dba_mysql($server, $port,$user,$pass,$db,$install);
+			$dba = new dba_mysql($server, $set_port,$user,$pass,$db,$install);
 		}
 	}
 
+	if(is_object($dba) && $dba->connected) {
+		$dns = (($dbtype == DBTYPE_POSTGRES) ? 'postgres' : 'mysql')
+		. ':host=' . $server . (is_null($port) ? '' : ';port=' . $port)
+		. ';dbname=' . $db;
+		$dba->pdo_set(array($dns,$user,$pass));
+	}
+
 	define('NULL_DATE', $dba->get_null_date());
 	define('ACTIVE_DBTYPE', $dbtype);
 	return $dba;
@@ -60,6 +68,7 @@ abstract class dba_driver {
 	const UTC_NOW = 'UTC_TIMESTAMP()';
 
 	protected $db;
+	protected $pdo = array();
 
 	public $debug = 0;
 	public  $connected = false;
@@ -183,6 +192,15 @@ abstract class dba_driver {
 	function unescapebin($str) {
 		return $str;
 	}
+
+	function pdo_set($x) {
+		$this->pdo = $x;
+	}
+
+	function pdo_get() {
+		return $this->pdo;
+	}
+
 } // end abstract dba_driver class
 
 
diff --git a/include/feedutils.php b/include/feedutils.php
new file mode 100644
index 000000000..2ba5efe22
--- /dev/null
+++ b/include/feedutils.php
@@ -0,0 +1,1316 @@
+<?php
+
+
+/**
+ * @brief Generate an Atom feed.
+ *
+ * @param array $channel
+ * @param array $params
+ */
+function get_public_feed($channel, $params) {
+
+	$type      = 'xml';
+	$begin     = NULL_DATE;
+	$end       = '';
+	$start     = 0;
+	$records   = 40;
+	$direction = 'desc';
+	$pages     = 0;
+
+	if(! $params)
+		$params = array();
+
+	$params['type']      = ((x($params,'type'))      ? $params['type']          : 'xml');
+	$params['begin']     = ((x($params,'begin'))     ? $params['begin']         : NULL_DATE);
+	$params['end']       = ((x($params,'end'))       ? $params['end']           : datetime_convert('UTC','UTC','now'));
+	$params['start']     = ((x($params,'start'))     ? $params['start']         : 0);
+	$params['records']   = ((x($params,'records'))   ? $params['records']       : 40);
+	$params['direction'] = ((x($params,'direction')) ? $params['direction']     : 'desc');
+	$params['pages']     = ((x($params,'pages'))     ? intval($params['pages']) : 0);
+	$params['top']       = ((x($params,'top'))       ? intval($params['top'])   : 0);
+	$params['cat']       = ((x($params,'cat'))       ? $params['cat']          : '');
+
+
+	// put a sane lower limit on feed requests if not specified
+
+//	if($params['begin'] === NULL_DATE)
+//		$params['begin'] = datetime_convert('UTC','UTC','now - 1 month');
+
+	switch($params['type']) {
+		case 'json':
+			header("Content-type: application/atom+json");
+			break;
+		case 'xml':
+		default:
+			header("Content-type: application/atom+xml");
+			break;
+	}
+
+	return get_feed_for($channel, get_observer_hash(), $params);
+}
+
+/**
+ * @brief
+ *
+ * @param array $channel
+ * @param string $observer_hash
+ * @param array $params
+ * @return string
+ */
+function get_feed_for($channel, $observer_hash, $params) {
+
+	if(! channel)
+		http_status_exit(401);
+
+	if($params['pages']) {
+		if(! perm_is_allowed($channel['channel_id'],$observer_hash,'view_pages'))
+			http_status_exit(403);
+	} else {
+		if(! perm_is_allowed($channel['channel_id'],$observer_hash,'view_stream'))
+			http_status_exit(403);
+	}
+	$items = items_fetch(array(
+		'wall' => '1',
+		'datequery' => $params['end'],
+		'datequery2' => $params['begin'],
+		'start' => $params['start'],          // FIXME
+	 	'records' => $params['records'],      // FIXME
+		'direction' => $params['direction'],  // FIXME
+		'pages' => $params['pages'],
+		'order' => 'post',
+		'top'   => $params['top'],
+		'cat'   => $params['cat']
+		), $channel, $observer_hash, CLIENT_MODE_NORMAL, App::$module);
+	
+
+	$feed_template = get_markup_template('atom_feed.tpl');
+
+	$atom = '';
+
+	$atom .= replace_macros($feed_template, array(
+		'$version'      => xmlify(Zotlabs\Project\System::get_project_version()),
+		'$red'          => xmlify(Zotlabs\Project\System::get_platform_name()),
+		'$feed_id'      => xmlify($channel['xchan_url']),
+		'$feed_title'   => xmlify($channel['channel_name']),
+		'$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', 'now' , ATOM_TIME)) ,
+		'$hub'          => '', // feed_hublinks(),
+		'$salmon'       => '', // feed_salmonlinks($channel['channel_address']),
+		'$name'         => xmlify($channel['channel_name']),
+		'$profile_page' => xmlify($channel['xchan_url']),
+		'$mimephoto'    => xmlify($channel['xchan_photo_mimetype']),
+		'$photo'        => xmlify($channel['xchan_photo_l']),
+		'$thumb'        => xmlify($channel['xchan_photo_m']),
+		'$picdate'      => '',
+		'$uridate'      => '',
+		'$namdate'      => '',
+		'$birthday'     => '',
+		'$community'    => '',
+	));
+
+
+	call_hooks('atom_feed', $atom);
+
+	if($items) {
+		$type = 'html';
+		foreach($items as $item) {
+			if($item['item_private'])
+				continue;
+
+			/** @BUG $owner is undefined in this call */
+			$atom .= atom_entry($item, $type, null, $owner, true);
+		}
+	}
+
+	call_hooks('atom_feed_end', $atom);
+
+	$atom .= '</feed>' . "\r\n";
+
+	return $atom;
+}
+
+/**
+ * @brief
+ *
+ * @param array $item an associative array with
+ *   * \b string \b verb
+ * @return string item's verb if set, default ACTIVITY_POST see boot.php
+ */
+function construct_verb($item) {
+	if ($item['verb'])
+		return $item['verb'];
+
+	return ACTIVITY_POST;
+}
+
+function construct_activity_object($item) {
+
+	if($item['object']) {
+		$o = '<as:object>' . "\r\n";
+		$r = json_decode($item['object'],false);
+
+		if(! $r)
+			return '';
+		if($r->type)
+			$o .= '<as:obj_type>' . xmlify($r->type) . '</as:obj_type>' . "\r\n";
+		if($r->id)
+			$o .= '<id>' . xmlify($r->id) . '</id>' . "\r\n";
+		if($r->title)
+			$o .= '<title>' . xmlify($r->title) . '</title>' . "\r\n";
+		if($r->links) {
+			/** @FIXME!! */
+			if(substr($r->link,0,1) === '<') {
+				$r->link = preg_replace('/\<link(.*?)\"\>/','<link$1"/>',$r->link);
+				$o .= $r->link;
+			}
+			else
+				$o .= '<link rel="alternate" type="text/html" href="' . xmlify($r->link) . '" />' . "\r\n";
+		}
+		if($r->content)
+			$o .= '<content type="html" >' . xmlify(bbcode($r->content)) . '</content>' . "\r\n";
+		$o .= '</as:object>' . "\r\n";
+		return $o;
+	}
+
+	return '';
+}
+
+function construct_activity_target($item) {
+
+	if($item['target']) {
+		$o = '<as:target>' . "\r\n";
+		$r = json_decode($item['target'],false);
+		if(! $r)
+			return '';
+		if($r->type)
+			$o .= '<as:obj_type>' . xmlify($r->type) . '</as:obj_type>' . "\r\n";
+		if($r->id)
+			$o .= '<id>' . xmlify($r->id) . '</id>' . "\r\n";
+		if($r->title)
+			$o .= '<title>' . xmlify($r->title) . '</title>' . "\r\n";
+		if($r->links) {
+			/** @FIXME !!! */
+			if(substr($r->link,0,1) === '<') {
+				if(strstr($r->link,'&') && (! strstr($r->link,'&amp;')))
+					$r->link = str_replace('&','&amp;', $r->link);
+				$r->link = preg_replace('/\<link(.*?)\"\>/','<link$1"/>',$r->link);
+				$o .= $r->link;
+			}
+			else
+				$o .= '<link rel="alternate" type="text/html" href="' . xmlify($r->link) . '" />' . "\r\n";
+		}
+		if($r->content)
+			$o .= '<content type="html" >' . xmlify(bbcode($r->content)) . '</content>' . "\r\n";
+
+		$o .= '</as:target>' . "\r\n";
+
+		return $o;
+	}
+
+	return '';
+}
+
+/**
+ * @param object $feed
+ * @param array $item
+ * @param[out] array $author
+ * @return multitype:multitype: string NULL number Ambigous <NULL, string, number> Ambigous <mixed, string> Ambigous <multitype:multitype:string Ambigous <NULL, string>  , multitype:multitype:string unknown  > multitype:NULL unknown
+ */
+function get_atom_elements($feed, $item, &$author) {
+
+	//$best_photo = array();
+
+	$res = array();
+
+	$found_author = $item->get_author();
+	if($found_author) {
+		$author['author_name'] = unxmlify($found_author->get_name());
+		$author['author_link'] = unxmlify($found_author->get_link());
+		$author['author_is_feed'] = false;
+	}
+	else {
+		$author['author_name'] = unxmlify($feed->get_title());
+		$author['author_link'] = unxmlify($feed->get_permalink());
+		$author['author_is_feed'] = true;
+	}
+
+	if(substr($author['author_link'],-1,1) == '/')
+		$author['author_link'] = substr($author['author_link'],0,-1);
+
+	$res['mid'] = base64url_encode(unxmlify($item->get_id()));
+	$res['title'] = unxmlify($item->get_title());
+	$res['body'] = unxmlify($item->get_content());
+	$res['plink'] = unxmlify($item->get_link(0));
+	$res['item_rss'] = 1;
+
+
+	// removing the content of the title if its identically to the body
+	// This helps with auto generated titles e.g. from tumblr
+
+	if (title_is_body($res["title"], $res["body"]))
+		$res['title'] = "";
+
+	if($res['plink'])
+		$base_url = implode('/', array_slice(explode('/',$res['plink']),0,3));
+	else
+		$base_url = '';
+
+	// look for a photo. We should check media size and find the best one,
+	// but for now let's just find any author photo
+
+	$rawauthor = $item->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10,'author');
+
+	if($rawauthor && $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) {
+		$base = $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
+		foreach($base as $link) {
+			if(!x($author, 'author_photo') || ! $author['author_photo']) {
+				if($link['attribs']['']['rel'] === 'photo' || $link['attribs']['']['rel'] === 'avatar')
+					$author['author_photo'] = unxmlify($link['attribs']['']['href']);
+			}
+		}
+	}
+
+	$rawactor = $item->get_item_tags(NAMESPACE_ACTIVITY, 'actor');
+
+	if($rawactor && activity_match($rawactor[0]['child'][NAMESPACE_ACTIVITY]['obj_type'][0]['data'],ACTIVITY_OBJ_PERSON)) {
+		$base = $rawactor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
+		if($base && count($base)) {
+			foreach($base as $link) {
+				if($link['attribs']['']['rel'] === 'alternate' && (! $res['author_link']))
+					$author['author_link'] = unxmlify($link['attribs']['']['href']);
+				if(!x($author, 'author_photo') || ! $author['author_photo']) {
+					if($link['attribs']['']['rel'] === 'avatar' || $link['attribs']['']['rel'] === 'photo')
+						$author['author_photo'] = unxmlify($link['attribs']['']['href']);
+				}
+			}
+		}
+	}
+
+	// check for a yahoo media element (github etc.)
+
+	if(! $author['author_photo']) {
+		$rawmedia = $item->get_item_tags(NAMESPACE_YMEDIA,'thumbnail');
+		if($rawmedia && $rawmedia[0]['attribs']['']['url']) {
+			$author['author_photo'] = strip_tags(unxmlify($rawmedia[0]['attribs']['']['url']));
+		}
+	}
+
+
+	// No photo/profile-link on the item - look at the feed level
+
+	if((! (x($author,'author_link'))) || (! (x($author,'author_photo')))) {
+		$rawauthor = $feed->get_feed_tags(SIMPLEPIE_NAMESPACE_ATOM_10,'author');
+		if($rawauthor && $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) {
+			$base = $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
+			foreach($base as $link) {
+				if($link['attribs']['']['rel'] === 'alternate' && (! $author['author_link'])) {
+					$author['author_link'] = unxmlify($link['attribs']['']['href']);
+					$author['author_is_feed'] = true;
+				}
+				if(! $author['author_photo']) {
+					if($link['attribs']['']['rel'] === 'photo' || $link['attribs']['']['rel'] === 'avatar')
+						$author['author_photo'] = unxmlify($link['attribs']['']['href']);
+				}
+			}
+		}
+
+		$rawactor = $feed->get_feed_tags(NAMESPACE_ACTIVITY, 'subject');
+
+		if($rawactor && activity_match($rawactor[0]['child'][NAMESPACE_ACTIVITY]['obj_type'][0]['data'],ACTIVITY_OBJ_PERSON)) {
+			$base = $rawactor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
+
+			if($base && count($base)) {
+				foreach($base as $link) {
+					if($link['attribs']['']['rel'] === 'alternate' && (! $res['author_link']))
+						$author['author_link'] = unxmlify($link['attribs']['']['href']);
+					if(! (x($author,'author_photo'))) {
+						if($link['attribs']['']['rel'] === 'avatar' || $link['attribs']['']['rel'] === 'photo')
+							$author['author_photo'] = unxmlify($link['attribs']['']['href']);
+					}
+				}
+			}
+		}
+	}
+
+	$apps = $item->get_item_tags(NAMESPACE_STATUSNET,'notice_info');
+	if($apps && $apps[0]['attribs']['']['source']) {
+		$res['app'] = strip_tags(unxmlify($apps[0]['attribs']['']['source']));
+	}
+
+	/*
+	 * If there's a copy of the body content which is guaranteed to have survived mangling in transit, use it.
+	 */
+
+	$have_real_body = false;
+
+	$rawenv = $item->get_item_tags(NAMESPACE_DFRN, 'env');
+	if($rawenv) {
+		$have_real_body = true;
+		$res['body'] = $rawenv[0]['data'];
+		$res['body'] = str_replace(array(' ',"\t","\r","\n"), array('','','',''),$res['body']);
+		// make sure nobody is trying to sneak some html tags by us
+		$res['body'] = notags(base64url_decode($res['body']));
+
+		// We could probably turn these old Friendica bbcode bookmarks into bookmark tags but we'd have to
+		// create a term table item for them. For now just make sure they stay as links.
+
+		$res['body'] = preg_replace('/\[bookmark(.*?)\](.*?)\[\/bookmark\]/','[url$1]$2[/url]',$res['body']);
+	}
+
+	$res['body'] = limit_body_size($res['body']);
+
+	// It isn't certain at this point whether our content is plaintext or html and we'd be foolish to trust
+	// the content type. Our own network only emits text normally, though it might have been converted to
+	// html if we used a pubsubhubbub transport. But if we see even one html tag in our text, we will
+	// have to assume it is all html and needs to be purified.
+
+	// It doesn't matter all that much security wise - because before this content is used anywhere, we are
+	// going to escape any tags we find regardless, but this lets us import a limited subset of html from
+	// the wild, by sanitising it and converting supported tags to bbcode before we rip out any remaining
+	// html.
+
+	if((strpos($res['body'],'<') !== false) && (strpos($res['body'],'>') !== false)) {
+
+		$res['body'] = reltoabs($res['body'],$base_url);
+
+		$res['body'] = html2bb_video($res['body']);
+
+		$res['body'] = oembed_html2bbcode($res['body']);
+
+		$res['body'] = purify_html($res['body']);
+
+		$res['body'] = @html2bbcode($res['body']);
+	}
+	elseif(! $have_real_body) {
+
+		// it's not one of our messages and it has no tags
+		// so it's probably just text. We'll escape it just to be safe.
+
+		$res['body'] = escape_tags($res['body']);
+	}
+
+	if($res['plink'] && $res['title']) {
+		$res['body'] = '#^[url=' . $res['plink'] . ']' . $res['title'] . '[/url]' . "\n\n" . $res['body'];
+		$terms = array();
+		$terms[] = array(
+			'otype' => TERM_OBJ_POST,
+			'type'  => TERM_BOOKMARK,
+			'url'   => $res['plink'],
+			'term'  => $res['title'],
+		);
+	}
+	elseif($res['plink']) {
+		$res['body'] = '#^[url]' . $res['plink'] . '[/url]' . "\n\n" . $res['body'];
+		$terms = array();
+		$terms[] = array(
+			'otype' => TERM_OBJ_POST,
+			'type'  => TERM_BOOKMARK,
+			'url'   => $res['plink'],
+			'term'  => $res['plink'],
+		);
+	}
+
+	$private = $item->get_item_tags(NAMESPACE_DFRN,'private');
+	if($private && intval($private[0]['data']) > 0)
+		$res['item_private'] = ((intval($private[0]['data'])) ? 1 : 0);
+	else
+		$res['item_private'] = 0;
+
+	$rawlocation = $item->get_item_tags(NAMESPACE_DFRN, 'location');
+	if($rawlocation)
+		$res['location'] = unxmlify($rawlocation[0]['data']);
+
+	$rawcreated = $item->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10,'published');
+	if($rawcreated)
+		$res['created'] = unxmlify($rawcreated[0]['data']);
+
+	$rawedited = $item->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10,'updated');
+	if($rawedited)
+		$res['edited'] = unxmlify($rawedited[0]['data']);
+
+	if((x($res,'edited')) && (! (x($res,'created'))))
+		$res['created'] = $res['edited'];
+
+	if(! $res['created'])
+		$res['created'] = $item->get_date('c');
+
+	if(! $res['edited'])
+		$res['edited'] = $item->get_date('c');
+
+
+	// Disallow time travelling posts
+
+	$d1 = strtotime($res['created']);
+	$d2 = strtotime($res['edited']);
+	$d3 = strtotime('now');
+
+	if($d1 > $d3)
+		$res['created'] = datetime_convert();
+	if($d2 > $d3)
+		$res['edited'] = datetime_convert();
+
+	$res['created'] = datetime_convert('UTC','UTC',$res['created']);
+	$res['edited'] = datetime_convert('UTC','UTC',$res['edited']);
+
+	$rawowner = $item->get_item_tags(NAMESPACE_DFRN, 'owner');
+	if(! $rawowner)
+		$rawowner = $item->get_item_tags(NAMESPACE_ZOT,'owner');
+
+	if($rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data'])
+		$author['owner_name'] = unxmlify($rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data']);
+	elseif($rawowner[0]['child'][NAMESPACE_DFRN]['name'][0]['data'])
+		$author['owner_name'] = unxmlify($rawowner[0]['child'][NAMESPACE_DFRN]['name'][0]['data']);
+	if($rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data'])
+		$author['owner_link'] = unxmlify($rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data']);
+	elseif($rawowner[0]['child'][NAMESPACE_DFRN]['uri'][0]['data'])
+		$author['owner_link'] = unxmlify($rawowner[0]['child'][NAMESPACE_DFRN]['uri'][0]['data']);
+
+	if($rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) {
+		$base = $rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
+
+		foreach($base as $link) {
+			if(!x($author, 'owner_photo') || ! $author['owner_photo']) {
+				if($link['attribs']['']['rel'] === 'photo' || $link['attribs']['']['rel'] === 'avatar')
+					$author['owner_photo'] = unxmlify($link['attribs']['']['href']);
+			}
+		}
+	}
+
+	$rawgeo = $item->get_item_tags(NAMESPACE_GEORSS,'point');
+	if($rawgeo)
+		$res['coord'] = unxmlify($rawgeo[0]['data']);
+
+
+	$rawverb = $item->get_item_tags(NAMESPACE_ACTIVITY, 'verb');
+
+	// select between supported verbs
+
+	if($rawverb) {
+		$res['verb'] = unxmlify($rawverb[0]['data']);
+	}
+
+	// translate OStatus unfollow to activity streams if it happened to get selected
+
+	if((x($res,'verb')) && ($res['verb'] === 'http://ostatus.org/schema/1.0/unfollow'))
+		$res['verb'] = ACTIVITY_UNFOLLOW;
+
+	$cats = $item->get_categories();
+	if($cats) {
+		if(is_null($terms))
+			$terms = array();
+		foreach($cats as $cat) {
+			$term = $cat->get_term();
+			if(! $term)
+				$term = $cat->get_label();
+			$scheme = $cat->get_scheme();
+			$termurl = '';
+			if($scheme && $term && stristr($scheme,'X-DFRN:')) {
+				$termtype = ((substr($scheme,7,1) === '#') ? TERM_HASHTAG : TERM_MENTION);
+				$termurl = unxmlify(substr($scheme,9));
+			}
+			else {
+				$termtype = TERM_CATEGORY;
+			}
+			$termterm = notags(trim(unxmlify($term)));
+
+			if($termterm) {
+				$terms[] = array(
+					'otype' => TERM_OBJ_POST,
+					'type'  => $termtype,
+					'url'   => $termurl,
+					'term'  => $termterm,
+				);
+			}
+		}
+	}
+
+	if(! is_null($terms))
+		$res['term'] =  $terms;
+
+	$attach = $item->get_enclosures();
+	if($attach) {
+		$res['attach'] = array();
+		foreach($attach as $att) {
+			$len   = intval($att->get_length());
+			$link  = str_replace(array(',','"'),array('%2D','%22'),notags(trim(unxmlify($att->get_link()))));
+			$title = str_replace(array(',','"'),array('%2D','%22'),notags(trim(unxmlify($att->get_title()))));
+			$type  = str_replace(array(',','"'),array('%2D','%22'),notags(trim(unxmlify($att->get_type()))));
+			if(strpos($type,';'))
+				$type = substr($type,0,strpos($type,';'));
+			if((! $link) || (strpos($link,'http') !== 0))
+				continue;
+
+			if(! $title)
+				$title = ' ';
+			if(! $type)
+				$type = 'application/octet-stream';
+
+			$res['attach'][] = array('href' => $link, 'length' => $len, 'type' => $type, 'title' => $title );
+		}
+	}
+
+	$rawobj = $item->get_item_tags(NAMESPACE_ACTIVITY, 'object');
+
+	if($rawobj) {
+		$obj = array();
+
+		$child = $rawobj[0]['child'];
+		if($child[NAMESPACE_ACTIVITY]['obj_type'][0]['data']) {
+			$res['obj_type'] = $child[NAMESPACE_ACTIVITY]['obj_type'][0]['data'];
+			$obj['type'] = $child[NAMESPACE_ACTIVITY]['obj_type'][0]['data'];
+		}
+		if($child[NAMESPACE_ACTIVITY]['object-type'][0]['data']) {
+			$res['obj_type'] = $child[NAMESPACE_ACTIVITY]['object-type'][0]['data'];
+			$obj['type'] = $child[NAMESPACE_ACTIVITY]['object-type'][0]['data'];
+		}
+		if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'id') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'])
+			$obj['id'] = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'];
+		if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'link') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
+			$obj['link'] = encode_rel_links($child[SIMPLEPIE_NAMESPACE_ATOM_10]['link']);
+		if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'title') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'])
+			$obj['title'] =  $child[SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'];
+		if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'content') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data']) {
+			$body = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data'];
+			if(! $body)
+				$body = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['summary'][0]['data'];
+			// preserve a copy of the original body content in case we later need to parse out any microformat information, e.g. events
+			$obj['orig'] = xmlify($body);
+			if((strpos($body,'<') !== false) || (strpos($body,'>') !== false)) {
+				$body = purify_html($body);
+				$body = html2bbcode($body);
+			}
+
+			$obj['content'] = $body;
+		}
+
+		$res['object'] = $obj;
+	}
+
+	$rawobj = $item->get_item_tags(NAMESPACE_ACTIVITY, 'target');
+
+	if($rawobj) {
+		$obj = array();
+
+		$child = $rawobj[0]['child'];
+		if($child[NAMESPACE_ACTIVITY]['obj_type'][0]['data']) {
+			$res['tgt_type'] = $child[NAMESPACE_ACTIVITY]['obj_type'][0]['data'];
+			$obj['type'] = $child[NAMESPACE_ACTIVITY]['obj_type'][0]['data'];
+		}
+		if($child[NAMESPACE_ACTIVITY]['object-type'][0]['data']) {
+			$res['tgt_type'] = $child[NAMESPACE_ACTIVITY]['object-type'][0]['data'];
+			$obj['type'] = $child[NAMESPACE_ACTIVITY]['object-type'][0]['data'];
+		}
+		if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'id') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'])
+			$obj['id'] = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'];
+		if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'link') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
+			$obj['link'] = encode_rel_links($child[SIMPLEPIE_NAMESPACE_ATOM_10]['link']);
+		if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'title') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'])
+			$obj['title'] =  $child[SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'];
+		if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'content') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data']) {
+			$body = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data'];
+			if(! $body)
+				$body = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['summary'][0]['data'];
+
+			// preserve a copy of the original body content in case we later need to parse out any microformat information, e.g. events
+			$obj['orig'] = xmlify($body);
+			if((strpos($body,'<') !== false) || (strpos($body,'>') !== false)) {
+				$body = purify_html($body);
+				$body = html2bbcode($body);
+			}
+
+			$obj['content'] = $body;
+		}
+
+		$res['target'] = $obj;
+	}
+
+	$arr = array('feed' => $feed, 'item' => $item, 'result' => $res);
+
+	call_hooks('parse_atom', $arr);
+	logger('get_atom_elements: author: ' . print_r($author,true),LOGGER_DATA);
+
+	logger('get_atom_elements: ' . print_r($res,true),LOGGER_DATA);
+
+	return $res;
+}
+
+function encode_rel_links($links) {
+	$o = array();
+	if(! ((is_array($links)) && (count($links))))
+		return $o;
+
+	foreach($links as $link) {
+		$l = array();
+		if($link['attribs']['']['rel'])
+			$l['rel'] =  $link['attribs']['']['rel'];
+		if($link['attribs']['']['type'])
+			$l['type'] =  $link['attribs']['']['type'];
+		if($link['attribs']['']['href'])
+			$l['href'] = $link['attribs']['']['href'];
+		if( (x($link['attribs'],NAMESPACE_MEDIA)) && $link['attribs'][NAMESPACE_MEDIA]['width'])
+			$l['width'] = $link['attribs'][NAMESPACE_MEDIA]['width'];
+		if( (x($link['attribs'],NAMESPACE_MEDIA)) && $link['attribs'][NAMESPACE_MEDIA]['height'])
+			$l['height'] = $link['attribs'][NAMESPACE_MEDIA]['height'];
+
+		if($l)
+			$o[] = $l;
+	}
+	return $o;
+}
+
+/**
+ * @brief Process atom feed and update anything/everything we might need to update.
+ *
+ * @param array $xml
+ *   The (atom) feed to consume - RSS isn't as fully supported but may work for simple feeds.
+ * @param $importer
+ *   The contact_record (joined to user_record) of the local user who owns this
+ *   relationship. It is this person's stuff that is going to be updated.
+ * @param $contact
+ *   The person who is sending us stuff. If not set, we MAY be processing a "follow" activity
+ *   from an external network and MAY create an appropriate contact record. Otherwise, we MUST
+ *   have a contact record.
+ * @param int $pass by default ($pass = 0) we cannot guarantee that a parent item has been
+ *   imported prior to its children being seen in the stream unless we are certain
+ *   of how the feed is arranged/ordered.
+ *  * With $pass = 1, we only pull parent items out of the stream.
+ *  * With $pass = 2, we only pull children (comments/likes).
+ *
+ * So running this twice, first with pass 1 and then with pass 2 will do the right
+ * thing regardless of feed ordering. This won't be adequate in a fully-threaded
+ * model where comments can have sub-threads. That would require some massive sorting
+ * to get all the feed items into a mostly linear ordering, and might still require
+ * recursion.
+ */
+function consume_feed($xml, $importer, &$contact, $pass = 0) {
+
+	require_once('library/simplepie/simplepie.inc');
+
+	if(! strlen($xml)) {
+		logger('consume_feed: empty input');
+		return;
+	}
+
+	$sys_expire = intval(get_config('system','default_expire_days'));
+	$chn_expire = intval($importer['channel_expire_days']);
+
+	$expire_days = $sys_expire;
+
+	if(($chn_expire != 0) && ($chn_expire < $sys_expire))
+		$expire_days = $chn_expire;
+
+	// logger('expire_days: ' . $expire_days);
+
+	$feed = new SimplePie();
+	$feed->set_raw_data($xml);
+	$feed->init();
+
+	if($feed->error())
+		logger('consume_feed: Error parsing XML: ' . $feed->error());
+
+	$permalink = $feed->get_permalink();
+
+	// Check at the feed level for updated contact name and/or photo
+
+	// process any deleted entries
+
+	$del_entries = $feed->get_feed_tags(NAMESPACE_TOMB, 'deleted-entry');
+	if(is_array($del_entries) && count($del_entries) && $pass != 2) {
+		foreach($del_entries as $dentry) {
+			$deleted = false;
+			if(isset($dentry['attribs']['']['ref'])) {
+				$mid = $dentry['attribs']['']['ref'];
+				$deleted = true;
+				if(isset($dentry['attribs']['']['when'])) {
+					$when = $dentry['attribs']['']['when'];
+					$when = datetime_convert('UTC','UTC', $when, 'Y-m-d H:i:s');
+				}
+				else
+					$when = datetime_convert('UTC','UTC','now','Y-m-d H:i:s');
+			}
+
+			if($deleted && is_array($contact)) {
+				$r = q("SELECT * from item where mid = '%s' and author_xchan = '%s' and uid = %d limit 1",
+					dbesc(base64url_encode($mid)),
+					dbesc($contact['xchan_hash']),
+					intval($importer['channel_id'])
+				);
+
+				if($r) {
+					$item = $r[0];
+
+					if(! intval($item['item_deleted'])) {
+						logger('consume_feed: deleting item ' . $item['id'] . ' mid=' . base64url_decode($item['mid']), LOGGER_DEBUG);
+						drop_item($item['id'],false);
+					}
+				}
+			}
+		}
+	}
+
+	// Now process the feed
+
+	if($feed->get_item_quantity()) {
+
+		logger('consume_feed: feed item count = ' . $feed->get_item_quantity(), LOGGER_DEBUG);
+
+		$items = $feed->get_items();
+
+		foreach($items as $item) {
+
+			$is_reply = false;
+			$item_id = base64url_encode($item->get_id());
+
+			logger('consume_feed: processing ' . $item_id, LOGGER_DEBUG);
+
+			$rawthread = $item->get_item_tags( NAMESPACE_THREAD,'in-reply-to');
+			if(isset($rawthread[0]['attribs']['']['ref'])) {
+				$is_reply = true;
+				$parent_mid = base64url_encode($rawthread[0]['attribs']['']['ref']);
+			}
+
+			if($is_reply) {
+
+				if($pass == 1)
+					continue;
+
+				// Have we seen it? If not, import it.
+
+				$item_id  = base64url_encode($item->get_id());
+				$author = array();
+				$datarray = get_atom_elements($feed,$item,$author);
+
+				if($contact['xchan_network'] === 'rss') {
+					$datarray['public_policy'] = 'specific';
+					$datarray['comment_policy'] = 'none';
+				}
+
+				if((! x($author,'author_name')) || ($author['author_is_feed']))
+					$author['author_name'] = $contact['xchan_name'];
+				if((! x($author,'author_link')) || ($author['author_is_feed']))
+					$author['author_link'] = $contact['xchan_url'];
+				if((! x($author,'author_photo'))|| ($author['author_is_feed']))
+					$author['author_photo'] = $contact['xchan_photo_m'];
+
+				$datarray['author_xchan'] = '';
+
+				if($author['author_link'] != $contact['xchan_url']) {
+					$x = import_author_unknown(array('name' => $author['author_name'],'url' => $author['author_link'],'photo' => array('src' => $author['author_photo'])));
+					if($x)
+						$datarray['author_xchan'] = $x;
+				}
+				if(! $datarray['author_xchan'])
+					$datarray['author_xchan'] = $contact['xchan_hash'];
+
+				$datarray['owner_xchan'] = $contact['xchan_hash'];
+
+				$r = q("SELECT edited FROM item WHERE mid = '%s' AND uid = %d LIMIT 1",
+					dbesc($item_id),
+					intval($importer['channel_id'])
+				);
+
+
+				// Update content if 'updated' changes
+
+				if($r) {
+					if((x($datarray,'edited') !== false)
+						&& (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {
+
+						// do not accept (ignore) an earlier edit than one we currently have.
+						if(datetime_convert('UTC','UTC',$datarray['edited']) < $r[0]['edited'])
+							continue;
+
+						update_feed_item($importer['channel_id'],$datarray);
+					}
+					continue;
+				}
+
+				$datarray['parent_mid'] = $parent_mid;
+				$datarray['aid'] = $importer['channel_account_id'];
+				$datarray['uid'] = $importer['channel_id'];
+
+				logger('consume_feed: ' . print_r($datarray,true),LOGGER_DATA);
+
+				$xx = item_store($datarray);
+				$r = $xx['item_id'];
+				continue;
+			}
+			else {
+
+				// Head post of a conversation. Have we seen it? If not, import it.
+
+				$item_id  = base64url_encode($item->get_id());
+				$author = array();
+				$datarray = get_atom_elements($feed,$item,$author);
+
+				if($contact['xchan_network'] === 'rss') {
+					$datarray['public_policy'] = 'specific';
+					$datarray['comment_policy'] = 'none';
+				}
+
+
+				if(is_array($contact)) {
+					if((! x($author,'author_name')) || ($author['author_is_feed']))
+						$author['author_name'] = $contact['xchan_name'];
+					if((! x($author,'author_link')) || ($author['author_is_feed']))
+						$author['author_link'] = $contact['xchan_url'];
+					if((! x($author,'author_photo'))|| ($author['author_is_feed']))
+						$author['author_photo'] = $contact['xchan_photo_m'];
+				}
+
+				if((! x($author,'author_name')) || (! x($author,'author_link'))) {
+					logger('consume_feed: no author information! ' . print_r($author,true));
+					continue;
+				}
+
+				$datarray['author_xchan'] = '';
+
+				if(activity_match($datarray['verb'],ACTIVITY_FOLLOW) && $datarray['obj_type'] === ACTIVITY_OBJ_PERSON) {
+					$cb = array('item' => $datarray,'channel' => $importer, 'xchan' => null, 'author' => $author, 'caught' => false);
+					call_hooks('follow_from_feed',$cb);
+					if($cb['caught']) {
+						if($cb['return_code'])
+							http_status_exit($cb['return_code']);
+						continue;
+					}
+				}
+
+				if($author['author_link'] != $contact['xchan_url']) {
+					$x = import_author_unknown(array('name' => $author['author_name'],'url' => $author['author_link'],'photo' => array('src' => $author['author_photo'])));
+					if($x)
+						$datarray['author_xchan'] = $x;
+				}
+				if(! $datarray['author_xchan'])
+					$datarray['author_xchan'] = $contact['xchan_hash'];
+
+				$datarray['owner_xchan'] = $contact['xchan_hash'];
+
+				if(array_key_exists('created',$datarray) && $datarray['created'] != NULL_DATE && $expire_days) {
+					$t1 = $datarray['created'];
+					$t2 = datetime_convert('UTC','UTC','now - ' . $expire_days . 'days');
+					if($t1 < $t2) {
+						logger('feed content older than expiration. Ignoring.', LOGGER_DEBUG, LOG_INFO);
+						continue;
+					}
+				}
+
+
+
+				$r = q("SELECT edited FROM item WHERE mid = '%s' AND uid = %d LIMIT 1",
+					dbesc($item_id),
+					intval($importer['channel_id'])
+				);
+
+				// Update content if 'updated' changes
+
+				if($r) {
+					if((x($datarray,'edited') !== false)
+						&& (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {
+
+						// do not accept (ignore) an earlier edit than one we currently have.
+						if(datetime_convert('UTC','UTC',$datarray['edited']) < $r[0]['edited'])
+							continue;
+
+						update_feed_item($importer['channel_id'],$datarray);
+					}
+
+					continue;
+				}
+
+				$datarray['parent_mid'] = $item_id;
+				$datarray['uid'] = $importer['channel_id'];
+				$datarray['aid'] = $importer['channel_account_id'];
+
+				if(! link_compare($author['owner_link'],$contact['xchan_url'])) {
+					logger('consume_feed: Correcting item owner.', LOGGER_DEBUG);
+					$author['owner_name']   = $contact['name'];
+					$author['owner_link']   = $contact['url'];
+					$author['owner_avatar'] = $contact['thumb'];
+				}
+
+				if(! post_is_importable($datarray,$contact))
+					continue;
+
+				logger('consume_feed: author ' . print_r($author,true),LOGGER_DEBUG);
+
+				logger('consume_feed: ' . print_r($datarray,true),LOGGER_DATA);
+
+				$xx = item_store($datarray);
+				$r = $xx['item_id'];
+				continue;
+			}
+		}
+	}
+}
+
+
+/**
+ * @brief Process atom feed and return the first post and structure
+ *
+ * @param array $xml
+ *   The (atom) feed to consume - RSS isn't as fully supported but may work for simple feeds.
+ * @param $importer
+ *   The contact_record (joined to user_record) of the local user who owns this
+ *   relationship. It is this person's stuff that is going to be updated.
+ */
+
+function process_salmon_feed($xml, $importer) {
+
+	$ret = array();
+
+	require_once('library/simplepie/simplepie.inc');
+
+	if(! strlen($xml)) {
+		logger('process_feed: empty input');
+		return;
+	}
+
+	$feed = new SimplePie();
+	$feed->set_raw_data($xml);
+	$feed->init();
+
+	if($feed->error())
+		logger('Error parsing XML: ' . $feed->error());
+
+	$permalink = $feed->get_permalink();
+
+	if($feed->get_item_quantity()) {
+
+		// this should be exactly one
+
+		logger('feed item count = ' . $feed->get_item_quantity(), LOGGER_DEBUG);
+
+		$items = $feed->get_items();
+
+		foreach($items as $item) {
+
+			$item_id = base64url_encode($item->get_id());
+
+			logger('processing ' . $item_id, LOGGER_DEBUG);
+
+			$rawthread = $item->get_item_tags( NAMESPACE_THREAD,'in-reply-to');
+			if(isset($rawthread[0]['attribs']['']['ref'])) {
+				$is_reply = true;
+				$parent_mid = base64url_encode($rawthread[0]['attribs']['']['ref']);
+			}
+
+			if($is_reply)
+				$ret['parent_mid'] = $parent_mid;
+
+			$ret['author'] = array();
+
+			$datarray = get_atom_elements($feed,$item,$ret['author']);
+
+			// reset policies which are restricted by default for RSS connections
+			// This item is likely coming from GNU-social via salmon and allows public interaction 
+			$datarray['public_policy'] = '';
+			$datarray['comment_policy'] = '';
+
+			$ret['item'] = $datarray;			
+		}
+	}
+
+	return $ret;
+}
+
+/*
+ * Given an xml (atom) feed, find author and hub links
+ */
+
+
+function feed_meta($xml) {
+	require_once('library/simplepie/simplepie.inc');
+
+	$ret = array();
+
+    if(! strlen($xml)) {
+        logger('empty input');
+        return $ret;
+    }
+
+    $feed = new SimplePie();
+    $feed->set_raw_data($xml);
+    $feed->init();
+
+    if($feed->error()) {
+        logger('Error parsing XML: ' . $feed->error());
+		return $ret;
+	}
+
+    $ret['hubs'] = $feed->get_links('hub');
+
+//     logger('consume_feed: hubs: ' . print_r($hubs,true), LOGGER_DATA);
+	
+	$author = array();
+
+    $found_author = $feed->get_author();
+    if($found_author) {
+        $author['author_name'] = unxmlify($found_author->get_name());
+        $author['author_link'] = unxmlify($found_author->get_link());
+
+    	$rawauthor = $feed->get_feed_tags(SIMPLEPIE_NAMESPACE_ATOM_10,'author');
+		logger('rawauthor: ' . print_r($rawauthor,true));
+
+	    if($rawauthor) {
+			if($rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) {
+	    	    $base = $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
+    	    	foreach($base as $link) {
+        	    	if(!x($author, 'author_photo') || ! $author['author_photo']) {
+            	    	if($link['attribs']['']['rel'] === 'photo' || $link['attribs']['']['rel'] === 'avatar') {
+                	    	$author['author_photo'] = unxmlify($link['attribs']['']['href']);
+							break;
+						}
+    	        	}
+        		}
+			}
+			if($rawauthor[0]['child'][NAMESPACE_POCO]['displayName'][0]['data'])
+				$author['full_name'] = unxmlify($rawauthor[0]['child'][NAMESPACE_POCO]['displayName'][0]['data']);
+			if($rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data'])
+				$author['author_uri'] = unxmlify($rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data']);
+			
+		}
+    }
+
+    if(substr($author['author_link'],-1,1) == '/')
+        $author['author_link'] = substr($author['author_link'],0,-1);
+
+	$ret['author'] = $author; 
+
+	return $ret;
+}
+
+
+
+function update_feed_item($uid,$datarray) {
+	logger('update_feed_item: not implemented! ' . $uid . ' ' . print_r($datarray,true), LOGGER_DATA);
+}
+
+
+function handle_feed($uid,$abook_id,$url) {
+
+	require_once('include/Contact.php');
+	$channel = channelx_by_n($uid);
+	if(! $channel)
+		return;
+
+	$x = q("select * from abook left join xchan on abook_xchan = xchan_hash where abook_id = %d and abook_channel = %d limit 1",
+		dbesc($abook_id),
+		intval($uid)
+	);
+
+	$recurse = 0;
+	$z = z_fetch_url($url,false,$recurse,array('novalidate' => true));
+
+//logger('handle_feed:' . print_r($z,true));
+
+	if($z['success']) {
+		consume_feed($z['body'],$channel,$x[0],1);
+		consume_feed($z['body'],$channel,$x[0],2);
+	}
+}
+
+
+function atom_author($tag,$name,$uri,$h,$w,$type,$photo) {
+	$o = '';
+	if(! $tag)
+		return $o;
+
+	$name = xmlify($name);
+	$uri = xmlify($uri);
+	$h = intval($h);
+	$w = intval($w);
+	$photo = xmlify($photo);
+
+	$o .= "<$tag>\r\n";
+	$o .= "<name>$name</name>\r\n";
+	$o .= "<uri>$uri</uri>\r\n";
+	$o .= '<link rel="photo"  type="' . $type . '" media:width="' . $w . '" media:height="' . $h . '" href="' . $photo . '" />' . "\r\n";
+	$o .= '<link rel="avatar" type="' . $type . '" media:width="' . $w . '" media:height="' . $h . '" href="' . $photo . '" />' . "\r\n";
+
+	call_hooks('atom_author', $o);
+
+	$o .= "</$tag>\r\n";
+
+	return $o;
+}
+
+function atom_entry($item,$type,$author,$owner,$comment = false,$cid = 0) {
+
+	if(! $item['parent'])
+		return;
+
+	if($item['deleted'])
+		return '<at:deleted-entry ref="' . xmlify($item['mid']) . '" when="' . xmlify(datetime_convert('UTC','UTC',$item['edited'] . '+00:00',ATOM_TIME)) . '" />' . "\r\n";
+
+
+	create_export_photo_body($item);
+
+	if($item['allow_cid'] || $item['allow_gid'] || $item['deny_cid'] || $item['deny_gid'])
+		$body = fix_private_photos($item['body'],$owner['uid'],$item,$cid);
+	else
+		$body = $item['body'];
+
+	$o = "\r\n\r\n<entry>\r\n";
+
+	if(is_array($author))
+		$o .= atom_author('author',$author['xchan_name'],$author['xchan_url'],80,80,$author['xchan_photo_mimetype'],$author['xchan_photo_m']);
+	else
+		$o .= atom_author('author',$item['author']['xchan_name'],$item['author']['xchan_url'],80,80,$item['author']['xchan_photo_mimetype'], $item['author']['xchan_photo_m']);
+
+	$o .= atom_author('zot:owner',$item['owner']['xchan_name'],$item['owner']['xchan_url'],80,80,$item['owner']['xchan_photo_mimetype'],$item['owner']['xchan_photo_m']);
+
+	if(($item['parent'] != $item['id']) || ($item['parent_mid'] !== $item['mid']) || (($item['thr_parent'] !== '') && ($item['thr_parent'] !== $item['mid']))) {
+		$parent_item = (($item['thr_parent']) ? $item['thr_parent'] : $item['parent_mid']);
+		$o .= '<thr:in-reply-to ref="' . z_root() . '/display/' . xmlify($parent_item) . '" type="text/html" href="' .  xmlify($item['plink']) . '" />' . "\r\n";
+	}
+
+	if(activity_match($item['obj_type'],ACTIVITY_OBJ_EVENT) && activity_match($item['verb'],ACTIVITY_POST)) {
+		$obj = ((is_array($item['obj'])) ? $item['object'] : json_decode($item['object'],true));
+ 
+		$o .= '<title>' . xmlify($item['title']) . '</title>' . "\r\n";
+		$o .= '<summary xmlns="urn:ietf:params:xml:ns:xcal">' . xmlify(bbcode($obj['title'])) . '</summary>' . "\r\n";
+		$o .= '<dtstart xmlns="urn:ietf:params:xml:ns:xcal">' . datetime_convert('UTC','UTC', $obj['start'],'Ymd\\THis' . (($obj['adjust']) ? '\\Z' : '')) .  '</dtstart>' . "\r\n";
+		$o .= '<dtend xmlns="urn:ietf:params:xml:ns:xcal">' . datetime_convert('UTC','UTC', $obj['finish'],'Ymd\\THis' . (($obj['adjust']) ? '\\Z' : '')) .  '</dtend>' . "\r\n";
+		$o .= '<location xmlns="urn:ietf:params:xml:ns:xcal">' . xmlify(bbcode($obj['location'])) . '</location>' . "\r\n";
+		$o .= '<content type="' . $type . '" >' . xmlify(bbcode($obj['description'])) . '</content>' . "\r\n";
+	}
+	else {
+		$o .= '<title>' . xmlify($item['title']) . '</title>' . "\r\n";
+		$o .= '<content type="' . $type . '" >' . xmlify(prepare_text($body,$item['mimetype'])) . '</content>' . "\r\n";
+	}
+
+	$o .= '<id>' . z_root() . '/display/' . xmlify($item['mid']) . '</id>' . "\r\n";
+	$o .= '<published>' . xmlify(datetime_convert('UTC','UTC',$item['created'] . '+00:00',ATOM_TIME)) . '</published>' . "\r\n";
+	$o .= '<updated>' . xmlify(datetime_convert('UTC','UTC',$item['edited'] . '+00:00',ATOM_TIME)) . '</updated>' . "\r\n";
+
+	$o .= '<link rel="alternate" type="text/html" href="' . xmlify($item['plink']) . '" />' . "\r\n";
+
+	if($item['location']) {
+		$o .= '<zot:location>' . xmlify($item['location']) . '</zot:location>' . "\r\n";
+		$o .= '<poco:address><poco:formatted>' . xmlify($item['location']) . '</poco:formatted></poco:address>' . "\r\n";
+	}
+
+	if($item['coord'])
+		$o .= '<georss:point>' . xmlify($item['coord']) . '</georss:point>' . "\r\n";
+
+	if(($item['item_private']) || strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid']))
+		$o .= '<zot:private>' . (($item['item_private']) ? $item['item_private'] : 1) . '</zot:private>' . "\r\n";
+
+	if($item['app'])
+		$o .= '<statusnet:notice_info local_id="' . $item['id'] . '" source="' . xmlify($item['app']) . '" ></statusnet:notice_info>' . "\r\n";
+
+	$verb = construct_verb($item);
+	$o .= '<as:verb>' . xmlify($verb) . '</as:verb>' . "\r\n";
+	$actobj = construct_activity_object($item);
+	if(strlen($actobj))
+		$o .= $actobj;
+	$actarg = construct_activity_target($item);
+	if(strlen($actarg))
+		$o .= $actarg;
+
+	// FIXME
+//	$tags = item_getfeedtags($item);
+//	if(count($tags)) {
+//		foreach($tags as $t) {
+//			$o .= '<category scheme="X-DFRN:' . xmlify($t[0]) . ':' . xmlify($t[1]) . '" term="' . xmlify($t[2]) . '" />' . "\r\n";
+//		}
+//	}
+
+// FIXME
+//	$o .= item_getfeedattach($item);
+
+//	$mentioned = get_mentions($item,$tags);
+//	if($mentioned)
+//		$o .= $mentioned;
+
+	call_hooks('atom_entry', $o);
+
+	$o .= '</entry>' . "\r\n";
+
+	return $o;
+}
+
+
+function gen_asld($items) {
+	$ret = array();
+	if(! $items)
+		return $ret;
+	foreach($items as $item) {
+		$ret[] = i2asld($item);
+	}
+	return $ret;
+}
+
+
+function i2asld($i) {
+
+	if(! $i)
+		return array();
+
+	$ret = array();
+
+	$ret['@context'] = array( 'http://www.w3.org/ns/activitystreams', 'zot' => 'http://purl.org/zot/protocol');
+
+	if($i['verb']) {
+		if(strpos(dirname($i['verb'],'activitystrea.ms/schema/1.0'))) {
+			$ret['@type'] = ucfirst(basename($i['verb']));
+		}
+		elseif(strpos(dirname($i['verb'],'purl.org/zot'))) {
+			$ret['@type'] = 'zot:' . ucfirst(basename($i['verb']));
+		}
+	}
+	$ret['@id'] = $i['plink'];
+
+	$ret['published'] = datetime_convert('UTC','UTC',$i['created'],ATOM_TIME);
+
+	// we need to pass the parent into this
+//	if($i['id'] != $i['parent'] && $i['obj_type'] === ACTIVITY_OBJ_NOTE) {
+//		$ret['inReplyTo'] = asencode_note
+//	}
+
+	if($i['obj_type'] === ACTIVITY_OBJ_NOTE)
+		$ret['object'] = asencode_note($i);
+
+
+	$ret['actor'] = asencode_person($i['author']);
+
+	
+	return $ret;
+	
+}
+
+function asencode_note($i) {
+
+	$ret = array();
+
+	$ret['@type'] = 'Note';
+	$ret['@id'] = $i['plink'];
+	if($i['title'])
+		$ret['title'] = bbcode($i['title']);
+	$ret['content'] = bbcode($i['body']);
+	$ret['zot:owner'] = asencode_person($i['owner']);
+	$ret['published'] = datetime_convert('UTC','UTC',$i['created'],ATOM_TIME);
+	if($i['created'] !== $i['edited'])
+		$ret['updated'] = datetime_convert('UTC','UTC',$i['edited'],ATOM_TIME);
+
+	return $ret;
+}
+
+
+function asencode_person($p) {
+	$ret = array();
+	$ret['@type'] = 'Person';
+	$ret['@id'] = 'acct:' . $p['xchan_addr'];
+	$ret['displayName'] = $p['xchan_name'];
+	$ret['icon'] = array(
+		'@type' => 'Link',
+		'mediaType' => $p['xchan_photo_mimetype'],
+		'href' => $p['xchan_photo_m']
+	);
+	$ret['url'] = array(
+		'@type' => 'Link',
+		'mediaType' => 'text/html',
+		'href' => $p['xchan_url']
+	);
+
+	return $ret;
+}
diff --git a/include/import.php b/include/import.php
index 98c70fa19..00058047e 100644
--- a/include/import.php
+++ b/include/import.php
@@ -21,7 +21,7 @@ function import_channel($channel, $account_id, $seize) {
 		dbesc($channel['channel_address'])
 	);
 
-	if(($r) || (check_webbie(array($channel['channel_hash'])) !== $channel['channel_hash'])) {
+	if(($r) || (check_webbie(array($channel['channel_address'])) !== $channel['channel_address'])) {
 		if($r[0]['channel_guid'] === $channel['channel_guid'] || $r[0]['channel_hash'] === $channel['channel_hash']) {
 			logger('mod_import: duplicate channel. ', print_r($channel,true));
 			notice( t('Cannot create a duplicate channel identifier on this system. Import failed.') . EOL);
@@ -90,7 +90,6 @@ function import_channel($channel, $account_id, $seize) {
 	set_default_login_identity($account_id,$channel['channel_id'],false);
 	logger('import step 1');
 	$_SESSION['import_step'] = 1;
-	ref_session_write(session_id(), serialize($_SESSION));
 	return $channel;	
 
 }
diff --git a/include/items.php b/include/items.php
index bef04237b..adc06898d 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3,12 +3,13 @@
  * @file include/items.php
  */
 
-/** @todo deprecated in newer SabreDAV releases Sabre\HTTP\URLUtil */
-use Sabre\DAV\URLUtil;
+// uncertain if this line is needed and why
+use Sabre\HTTP\URLUtil;
 
 require_once('include/bbcode.php');
 require_once('include/oembed.php');
 require_once('include/crypto.php');
+require_once('include/feedutils.php');
 require_once('include/photo/photo_driver.php');
 require_once('include/permissions.php');
 
@@ -33,7 +34,6 @@ function collect_recipients($item, &$private_envelope) {
 		$allow_people = expand_acl($item['allow_cid']);
 
 		$allow_groups = expand_groups(expand_acl($item['allow_gid']));
-		$allow_groups = filter_insecure($item['uid'],$allow_groups);
 
 		$recipients = array_unique(array_merge($allow_people,$allow_groups));
 
@@ -140,46 +140,6 @@ function collect_recipients($item, &$private_envelope) {
 	return $recipients;
 }
 
-/**
- * If channel is configured to filter insecure members of privacy groups
- * (those whose networks leak privacy via email notifications or other criteria)
- * remove them from any privacy groups (collections) that were included in a post.
- * They can still be addressed individually.
- * Networks may need to be added or removed from this list as circumstances change.
- *
- * Update: this may need to be the default, which will force people to opt-in to
- * sending stuff privately to insecure platforms.
- *
- * @param int $channel_id
- * @param array $arr
- * @return array containing the sane xchan_hashes
- */
-function filter_insecure($channel_id, $arr) {
-	$insecure_nets = " and not xchan_network in ('diaspora', 'friendica-over-diaspora') ";
-
-	$ret = array();
-
-	if((! intval(get_pconfig($channel_id, 'system', 'filter_insecure_privacy_groups'))) || (! $arr))
-		return $arr;
-
-	$str = '';
-	foreach($arr as $rr) {
-		if(strlen($str))
-			$str .= ',';
-
-		$str .= "'" . dbesc($rr) . "'";
-	}
-	$r = q("select xchan_hash from xchan where xchan_hash in ($str) $insecure_nets");
-	if($r) {
-		foreach($r as $rr) {
-			$ret[] = $rr['xchan_hash'];
-		}
-	}
-
-	return $ret;
-}
-
-
 function comments_are_now_closed($item) {
 	if($item['comments_closed'] !== NULL_DATE) {
 		$d = datetime_convert();
@@ -523,214 +483,6 @@ function validate_item_elements($message,$arr) {
 
 
 
-/**
- * @brief Generate an Atom feed.
- *
- * @param array $channel
- * @param array $params
- */
-function get_public_feed($channel, $params) {
-
-	$type      = 'xml';
-	$begin     = NULL_DATE;
-	$end       = '';
-	$start     = 0;
-	$records   = 40;
-	$direction = 'desc';
-	$pages     = 0;
-
-	if(! $params)
-		$params = array();
-
-	$params['type']      = ((x($params,'type'))      ? $params['type']          : 'xml');
-	$params['begin']     = ((x($params,'begin'))     ? $params['begin']         : NULL_DATE);
-	$params['end']       = ((x($params,'end'))       ? $params['end']           : datetime_convert('UTC','UTC','now'));
-	$params['start']     = ((x($params,'start'))     ? $params['start']         : 0);
-	$params['records']   = ((x($params,'records'))   ? $params['records']       : 40);
-	$params['direction'] = ((x($params,'direction')) ? $params['direction']     : 'desc');
-	$params['pages']     = ((x($params,'pages'))     ? intval($params['pages']) : 0);
-	$params['top']       = ((x($params,'top'))       ? intval($params['top'])   : 0);
-	$params['cat']       = ((x($params,'cat'))       ? $params['cat']          : '');
-
-
-	// put a sane lower limit on feed requests if not specified
-
-//	if($params['begin'] === NULL_DATE)
-//		$params['begin'] = datetime_convert('UTC','UTC','now - 1 month');
-
-	switch($params['type']) {
-		case 'json':
-			header("Content-type: application/atom+json");
-			break;
-		case 'xml':
-		default:
-			header("Content-type: application/atom+xml");
-			break;
-	}
-
-	return get_feed_for($channel, get_observer_hash(), $params);
-}
-
-/**
- * @brief
- *
- * @param array $channel
- * @param string $observer_hash
- * @param array $params
- * @return string
- */
-function get_feed_for($channel, $observer_hash, $params) {
-
-	if(! channel)
-		http_status_exit(401);
-
-	if($params['pages']) {
-		if(! perm_is_allowed($channel['channel_id'],$observer_hash,'view_pages'))
-			http_status_exit(403);
-	} else {
-		if(! perm_is_allowed($channel['channel_id'],$observer_hash,'view_stream'))
-			http_status_exit(403);
-	}
-	$items = items_fetch(array(
-		'wall' => '1',
-		'datequery' => $params['end'],
-		'datequery2' => $params['begin'],
-		'start' => $params['start'],          // FIXME
-	 	'records' => $params['records'],      // FIXME
-		'direction' => $params['direction'],  // FIXME
-		'pages' => $params['pages'],
-		'order' => 'post',
-		'top'   => $params['top'],
-		'cat'   => $params['cat']
-		), $channel, $observer_hash, CLIENT_MODE_NORMAL, App::$module);
-	
-
-	$feed_template = get_markup_template('atom_feed.tpl');
-
-	$atom = '';
-
-	$atom .= replace_macros($feed_template, array(
-		'$version'      => xmlify(Zotlabs\Project\System::get_project_version()),
-		'$red'          => xmlify(Zotlabs\Project\System::get_platform_name()),
-		'$feed_id'      => xmlify($channel['xchan_url']),
-		'$feed_title'   => xmlify($channel['channel_name']),
-		'$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', 'now' , ATOM_TIME)) ,
-		'$hub'          => '', // feed_hublinks(),
-		'$salmon'       => '', // feed_salmonlinks($channel['channel_address']),
-		'$name'         => xmlify($channel['channel_name']),
-		'$profile_page' => xmlify($channel['xchan_url']),
-		'$mimephoto'    => xmlify($channel['xchan_photo_mimetype']),
-		'$photo'        => xmlify($channel['xchan_photo_l']),
-		'$thumb'        => xmlify($channel['xchan_photo_m']),
-		'$picdate'      => '',
-		'$uridate'      => '',
-		'$namdate'      => '',
-		'$birthday'     => '',
-		'$community'    => '',
-	));
-
-
-	call_hooks('atom_feed', $atom);
-
-	if($items) {
-		$type = 'html';
-		foreach($items as $item) {
-			if($item['item_private'])
-				continue;
-
-			/** @BUG $owner is undefined in this call */
-			$atom .= atom_entry($item, $type, null, $owner, true);
-		}
-	}
-
-	call_hooks('atom_feed_end', $atom);
-
-	$atom .= '</feed>' . "\r\n";
-
-	return $atom;
-}
-
-/**
- * @brief
- *
- * @param array $item an associative array with
- *   * \b string \b verb
- * @return string item's verb if set, default ACTIVITY_POST see boot.php
- */
-function construct_verb($item) {
-	if ($item['verb'])
-		return $item['verb'];
-
-	return ACTIVITY_POST;
-}
-
-function construct_activity_object($item) {
-
-	if($item['object']) {
-		$o = '<as:object>' . "\r\n";
-		$r = json_decode($item['object'],false);
-
-		if(! $r)
-			return '';
-		if($r->type)
-			$o .= '<as:obj_type>' . xmlify($r->type) . '</as:obj_type>' . "\r\n";
-		if($r->id)
-			$o .= '<id>' . xmlify($r->id) . '</id>' . "\r\n";
-		if($r->title)
-			$o .= '<title>' . xmlify($r->title) . '</title>' . "\r\n";
-		if($r->links) {
-			/** @FIXME!! */
-			if(substr($r->link,0,1) === '<') {
-				$r->link = preg_replace('/\<link(.*?)\"\>/','<link$1"/>',$r->link);
-				$o .= $r->link;
-			}
-			else
-				$o .= '<link rel="alternate" type="text/html" href="' . xmlify($r->link) . '" />' . "\r\n";
-		}
-		if($r->content)
-			$o .= '<content type="html" >' . xmlify(bbcode($r->content)) . '</content>' . "\r\n";
-		$o .= '</as:object>' . "\r\n";
-		return $o;
-	}
-
-	return '';
-}
-
-function construct_activity_target($item) {
-
-	if($item['target']) {
-		$o = '<as:target>' . "\r\n";
-		$r = json_decode($item['target'],false);
-		if(! $r)
-			return '';
-		if($r->type)
-			$o .= '<as:obj_type>' . xmlify($r->type) . '</as:obj_type>' . "\r\n";
-		if($r->id)
-			$o .= '<id>' . xmlify($r->id) . '</id>' . "\r\n";
-		if($r->title)
-			$o .= '<title>' . xmlify($r->title) . '</title>' . "\r\n";
-		if($r->links) {
-			/** @FIXME !!! */
-			if(substr($r->link,0,1) === '<') {
-				if(strstr($r->link,'&') && (! strstr($r->link,'&amp;')))
-					$r->link = str_replace('&','&amp;', $r->link);
-				$r->link = preg_replace('/\<link(.*?)\"\>/','<link$1"/>',$r->link);
-				$o .= $r->link;
-			}
-			else
-				$o .= '<link rel="alternate" type="text/html" href="' . xmlify($r->link) . '" />' . "\r\n";
-		}
-		if($r->content)
-			$o .= '<content type="html" >' . xmlify(bbcode($r->content)) . '</content>' . "\r\n";
-
-		$o .= '</as:target>' . "\r\n";
-
-		return $o;
-	}
-
-	return '';
-}
-
 /**
  * @brief Limit lenght on imported system messages.
  *
@@ -1742,453 +1494,6 @@ function get_profile_elements($x) {
 	return $arr;
 }
 
-/**
- * @param object $feed
- * @param array $item
- * @param[out] array $author
- * @return multitype:multitype: string NULL number Ambigous <NULL, string, number> Ambigous <mixed, string> Ambigous <multitype:multitype:string Ambigous <NULL, string>  , multitype:multitype:string unknown  > multitype:NULL unknown
- */
-function get_atom_elements($feed, $item, &$author) {
-
-	//$best_photo = array();
-
-	$res = array();
-
-	$found_author = $item->get_author();
-	if($found_author) {
-		$author['author_name'] = unxmlify($found_author->get_name());
-		$author['author_link'] = unxmlify($found_author->get_link());
-		$author['author_is_feed'] = false;
-	}
-	else {
-		$author['author_name'] = unxmlify($feed->get_title());
-		$author['author_link'] = unxmlify($feed->get_permalink());
-		$author['author_is_feed'] = true;
-	}
-
-	if(substr($author['author_link'],-1,1) == '/')
-		$author['author_link'] = substr($author['author_link'],0,-1);
-
-	$res['mid'] = base64url_encode(unxmlify($item->get_id()));
-	$res['title'] = unxmlify($item->get_title());
-	$res['body'] = unxmlify($item->get_content());
-	$res['plink'] = unxmlify($item->get_link(0));
-	$res['item_rss'] = 1;
-
-
-	// removing the content of the title if its identically to the body
-	// This helps with auto generated titles e.g. from tumblr
-
-	if (title_is_body($res["title"], $res["body"]))
-		$res['title'] = "";
-
-	if($res['plink'])
-		$base_url = implode('/', array_slice(explode('/',$res['plink']),0,3));
-	else
-		$base_url = '';
-
-	// look for a photo. We should check media size and find the best one,
-	// but for now let's just find any author photo
-
-	$rawauthor = $item->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10,'author');
-
-	if($rawauthor && $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) {
-		$base = $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
-		foreach($base as $link) {
-			if(!x($author, 'author_photo') || ! $author['author_photo']) {
-				if($link['attribs']['']['rel'] === 'photo' || $link['attribs']['']['rel'] === 'avatar')
-					$author['author_photo'] = unxmlify($link['attribs']['']['href']);
-			}
-		}
-	}
-
-	$rawactor = $item->get_item_tags(NAMESPACE_ACTIVITY, 'actor');
-
-	if($rawactor && activity_match($rawactor[0]['child'][NAMESPACE_ACTIVITY]['obj_type'][0]['data'],ACTIVITY_OBJ_PERSON)) {
-		$base = $rawactor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
-		if($base && count($base)) {
-			foreach($base as $link) {
-				if($link['attribs']['']['rel'] === 'alternate' && (! $res['author_link']))
-					$author['author_link'] = unxmlify($link['attribs']['']['href']);
-				if(!x($author, 'author_photo') || ! $author['author_photo']) {
-					if($link['attribs']['']['rel'] === 'avatar' || $link['attribs']['']['rel'] === 'photo')
-						$author['author_photo'] = unxmlify($link['attribs']['']['href']);
-				}
-			}
-		}
-	}
-
-	// check for a yahoo media element (github etc.)
-
-	if(! $author['author_photo']) {
-		$rawmedia = $item->get_item_tags(NAMESPACE_YMEDIA,'thumbnail');
-		if($rawmedia && $rawmedia[0]['attribs']['']['url']) {
-			$author['author_photo'] = strip_tags(unxmlify($rawmedia[0]['attribs']['']['url']));
-		}
-	}
-
-
-	// No photo/profile-link on the item - look at the feed level
-
-	if((! (x($author,'author_link'))) || (! (x($author,'author_photo')))) {
-		$rawauthor = $feed->get_feed_tags(SIMPLEPIE_NAMESPACE_ATOM_10,'author');
-		if($rawauthor && $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) {
-			$base = $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
-			foreach($base as $link) {
-				if($link['attribs']['']['rel'] === 'alternate' && (! $author['author_link'])) {
-					$author['author_link'] = unxmlify($link['attribs']['']['href']);
-					$author['author_is_feed'] = true;
-				}
-				if(! $author['author_photo']) {
-					if($link['attribs']['']['rel'] === 'photo' || $link['attribs']['']['rel'] === 'avatar')
-						$author['author_photo'] = unxmlify($link['attribs']['']['href']);
-				}
-			}
-		}
-
-		$rawactor = $feed->get_feed_tags(NAMESPACE_ACTIVITY, 'subject');
-
-		if($rawactor && activity_match($rawactor[0]['child'][NAMESPACE_ACTIVITY]['obj_type'][0]['data'],ACTIVITY_OBJ_PERSON)) {
-			$base = $rawactor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
-
-			if($base && count($base)) {
-				foreach($base as $link) {
-					if($link['attribs']['']['rel'] === 'alternate' && (! $res['author_link']))
-						$author['author_link'] = unxmlify($link['attribs']['']['href']);
-					if(! (x($author,'author_photo'))) {
-						if($link['attribs']['']['rel'] === 'avatar' || $link['attribs']['']['rel'] === 'photo')
-							$author['author_photo'] = unxmlify($link['attribs']['']['href']);
-					}
-				}
-			}
-		}
-	}
-
-	$apps = $item->get_item_tags(NAMESPACE_STATUSNET,'notice_info');
-	if($apps && $apps[0]['attribs']['']['source']) {
-		$res['app'] = strip_tags(unxmlify($apps[0]['attribs']['']['source']));
-	}
-
-	/*
-	 * If there's a copy of the body content which is guaranteed to have survived mangling in transit, use it.
-	 */
-
-	$have_real_body = false;
-
-	$rawenv = $item->get_item_tags(NAMESPACE_DFRN, 'env');
-	if($rawenv) {
-		$have_real_body = true;
-		$res['body'] = $rawenv[0]['data'];
-		$res['body'] = str_replace(array(' ',"\t","\r","\n"), array('','','',''),$res['body']);
-		// make sure nobody is trying to sneak some html tags by us
-		$res['body'] = notags(base64url_decode($res['body']));
-
-		// We could probably turn these old Friendica bbcode bookmarks into bookmark tags but we'd have to
-		// create a term table item for them. For now just make sure they stay as links.
-
-		$res['body'] = preg_replace('/\[bookmark(.*?)\](.*?)\[\/bookmark\]/','[url$1]$2[/url]',$res['body']);
-	}
-
-	$res['body'] = limit_body_size($res['body']);
-
-	// It isn't certain at this point whether our content is plaintext or html and we'd be foolish to trust
-	// the content type. Our own network only emits text normally, though it might have been converted to
-	// html if we used a pubsubhubbub transport. But if we see even one html tag in our text, we will
-	// have to assume it is all html and needs to be purified.
-
-	// It doesn't matter all that much security wise - because before this content is used anywhere, we are
-	// going to escape any tags we find regardless, but this lets us import a limited subset of html from
-	// the wild, by sanitising it and converting supported tags to bbcode before we rip out any remaining
-	// html.
-
-	if((strpos($res['body'],'<') !== false) && (strpos($res['body'],'>') !== false)) {
-
-		$res['body'] = reltoabs($res['body'],$base_url);
-
-		$res['body'] = html2bb_video($res['body']);
-
-		$res['body'] = oembed_html2bbcode($res['body']);
-
-		$res['body'] = purify_html($res['body']);
-
-		$res['body'] = @html2bbcode($res['body']);
-	}
-	elseif(! $have_real_body) {
-
-		// it's not one of our messages and it has no tags
-		// so it's probably just text. We'll escape it just to be safe.
-
-		$res['body'] = escape_tags($res['body']);
-	}
-
-	if($res['plink'] && $res['title']) {
-		$res['body'] = '#^[url=' . $res['plink'] . ']' . $res['title'] . '[/url]' . "\n\n" . $res['body'];
-		$terms = array();
-		$terms[] = array(
-			'otype' => TERM_OBJ_POST,
-			'type'  => TERM_BOOKMARK,
-			'url'   => $res['plink'],
-			'term'  => $res['title'],
-		);
-	}
-	elseif($res['plink']) {
-		$res['body'] = '#^[url]' . $res['plink'] . '[/url]' . "\n\n" . $res['body'];
-		$terms = array();
-		$terms[] = array(
-			'otype' => TERM_OBJ_POST,
-			'type'  => TERM_BOOKMARK,
-			'url'   => $res['plink'],
-			'term'  => $res['plink'],
-		);
-	}
-
-	$private = $item->get_item_tags(NAMESPACE_DFRN,'private');
-	if($private && intval($private[0]['data']) > 0)
-		$res['item_private'] = ((intval($private[0]['data'])) ? 1 : 0);
-	else
-		$res['item_private'] = 0;
-
-	$rawlocation = $item->get_item_tags(NAMESPACE_DFRN, 'location');
-	if($rawlocation)
-		$res['location'] = unxmlify($rawlocation[0]['data']);
-
-	$rawcreated = $item->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10,'published');
-	if($rawcreated)
-		$res['created'] = unxmlify($rawcreated[0]['data']);
-
-	$rawedited = $item->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10,'updated');
-	if($rawedited)
-		$res['edited'] = unxmlify($rawedited[0]['data']);
-
-	if((x($res,'edited')) && (! (x($res,'created'))))
-		$res['created'] = $res['edited'];
-
-	if(! $res['created'])
-		$res['created'] = $item->get_date('c');
-
-	if(! $res['edited'])
-		$res['edited'] = $item->get_date('c');
-
-
-	// Disallow time travelling posts
-
-	$d1 = strtotime($res['created']);
-	$d2 = strtotime($res['edited']);
-	$d3 = strtotime('now');
-
-	if($d1 > $d3)
-		$res['created'] = datetime_convert();
-	if($d2 > $d3)
-		$res['edited'] = datetime_convert();
-
-	$res['created'] = datetime_convert('UTC','UTC',$res['created']);
-	$res['edited'] = datetime_convert('UTC','UTC',$res['edited']);
-
-	$rawowner = $item->get_item_tags(NAMESPACE_DFRN, 'owner');
-	if(! $rawowner)
-		$rawowner = $item->get_item_tags(NAMESPACE_ZOT,'owner');
-
-	if($rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data'])
-		$author['owner_name'] = unxmlify($rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data']);
-	elseif($rawowner[0]['child'][NAMESPACE_DFRN]['name'][0]['data'])
-		$author['owner_name'] = unxmlify($rawowner[0]['child'][NAMESPACE_DFRN]['name'][0]['data']);
-	if($rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data'])
-		$author['owner_link'] = unxmlify($rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data']);
-	elseif($rawowner[0]['child'][NAMESPACE_DFRN]['uri'][0]['data'])
-		$author['owner_link'] = unxmlify($rawowner[0]['child'][NAMESPACE_DFRN]['uri'][0]['data']);
-
-	if($rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) {
-		$base = $rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
-
-		foreach($base as $link) {
-			if(!x($author, 'owner_photo') || ! $author['owner_photo']) {
-				if($link['attribs']['']['rel'] === 'photo' || $link['attribs']['']['rel'] === 'avatar')
-					$author['owner_photo'] = unxmlify($link['attribs']['']['href']);
-			}
-		}
-	}
-
-	$rawgeo = $item->get_item_tags(NAMESPACE_GEORSS,'point');
-	if($rawgeo)
-		$res['coord'] = unxmlify($rawgeo[0]['data']);
-
-
-	$rawverb = $item->get_item_tags(NAMESPACE_ACTIVITY, 'verb');
-
-	// select between supported verbs
-
-	if($rawverb) {
-		$res['verb'] = unxmlify($rawverb[0]['data']);
-	}
-
-	// translate OStatus unfollow to activity streams if it happened to get selected
-
-	if((x($res,'verb')) && ($res['verb'] === 'http://ostatus.org/schema/1.0/unfollow'))
-		$res['verb'] = ACTIVITY_UNFOLLOW;
-
-	$cats = $item->get_categories();
-	if($cats) {
-		if(is_null($terms))
-			$terms = array();
-		foreach($cats as $cat) {
-			$term = $cat->get_term();
-			if(! $term)
-				$term = $cat->get_label();
-			$scheme = $cat->get_scheme();
-			$termurl = '';
-			if($scheme && $term && stristr($scheme,'X-DFRN:')) {
-				$termtype = ((substr($scheme,7,1) === '#') ? TERM_HASHTAG : TERM_MENTION);
-				$termurl = unxmlify(substr($scheme,9));
-			}
-			else {
-				$termtype = TERM_CATEGORY;
-			}
-			$termterm = notags(trim(unxmlify($term)));
-
-			if($termterm) {
-				$terms[] = array(
-					'otype' => TERM_OBJ_POST,
-					'type'  => $termtype,
-					'url'   => $termurl,
-					'term'  => $termterm,
-				);
-			}
-		}
-	}
-
-	if(! is_null($terms))
-		$res['term'] =  $terms;
-
-	$attach = $item->get_enclosures();
-	if($attach) {
-		$res['attach'] = array();
-		foreach($attach as $att) {
-			$len   = intval($att->get_length());
-			$link  = str_replace(array(',','"'),array('%2D','%22'),notags(trim(unxmlify($att->get_link()))));
-			$title = str_replace(array(',','"'),array('%2D','%22'),notags(trim(unxmlify($att->get_title()))));
-			$type  = str_replace(array(',','"'),array('%2D','%22'),notags(trim(unxmlify($att->get_type()))));
-			if(strpos($type,';'))
-				$type = substr($type,0,strpos($type,';'));
-			if((! $link) || (strpos($link,'http') !== 0))
-				continue;
-
-			if(! $title)
-				$title = ' ';
-			if(! $type)
-				$type = 'application/octet-stream';
-
-			$res['attach'][] = array('href' => $link, 'length' => $len, 'type' => $type, 'title' => $title );
-		}
-	}
-
-	$rawobj = $item->get_item_tags(NAMESPACE_ACTIVITY, 'object');
-
-	if($rawobj) {
-		$obj = array();
-
-		$child = $rawobj[0]['child'];
-		if($child[NAMESPACE_ACTIVITY]['obj_type'][0]['data']) {
-			$res['obj_type'] = $child[NAMESPACE_ACTIVITY]['obj_type'][0]['data'];
-			$obj['type'] = $child[NAMESPACE_ACTIVITY]['obj_type'][0]['data'];
-		}
-		if($child[NAMESPACE_ACTIVITY]['object-type'][0]['data']) {
-			$res['obj_type'] = $child[NAMESPACE_ACTIVITY]['object-type'][0]['data'];
-			$obj['type'] = $child[NAMESPACE_ACTIVITY]['object-type'][0]['data'];
-		}
-		if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'id') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'])
-			$obj['id'] = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'];
-		if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'link') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
-			$obj['link'] = encode_rel_links($child[SIMPLEPIE_NAMESPACE_ATOM_10]['link']);
-		if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'title') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'])
-			$obj['title'] =  $child[SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'];
-		if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'content') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data']) {
-			$body = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data'];
-			if(! $body)
-				$body = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['summary'][0]['data'];
-			// preserve a copy of the original body content in case we later need to parse out any microformat information, e.g. events
-			$obj['orig'] = xmlify($body);
-			if((strpos($body,'<') !== false) || (strpos($body,'>') !== false)) {
-				$body = purify_html($body);
-				$body = html2bbcode($body);
-			}
-
-			$obj['content'] = $body;
-		}
-
-		$res['object'] = $obj;
-	}
-
-	$rawobj = $item->get_item_tags(NAMESPACE_ACTIVITY, 'target');
-
-	if($rawobj) {
-		$obj = array();
-
-		$child = $rawobj[0]['child'];
-		if($child[NAMESPACE_ACTIVITY]['obj_type'][0]['data']) {
-			$res['tgt_type'] = $child[NAMESPACE_ACTIVITY]['obj_type'][0]['data'];
-			$obj['type'] = $child[NAMESPACE_ACTIVITY]['obj_type'][0]['data'];
-		}
-		if($child[NAMESPACE_ACTIVITY]['object-type'][0]['data']) {
-			$res['tgt_type'] = $child[NAMESPACE_ACTIVITY]['object-type'][0]['data'];
-			$obj['type'] = $child[NAMESPACE_ACTIVITY]['object-type'][0]['data'];
-		}
-		if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'id') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'])
-			$obj['id'] = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'];
-		if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'link') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
-			$obj['link'] = encode_rel_links($child[SIMPLEPIE_NAMESPACE_ATOM_10]['link']);
-		if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'title') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'])
-			$obj['title'] =  $child[SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'];
-		if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'content') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data']) {
-			$body = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data'];
-			if(! $body)
-				$body = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['summary'][0]['data'];
-
-			// preserve a copy of the original body content in case we later need to parse out any microformat information, e.g. events
-			$obj['orig'] = xmlify($body);
-			if((strpos($body,'<') !== false) || (strpos($body,'>') !== false)) {
-				$body = purify_html($body);
-				$body = html2bbcode($body);
-			}
-
-			$obj['content'] = $body;
-		}
-
-		$res['target'] = $obj;
-	}
-
-	$arr = array('feed' => $feed, 'item' => $item, 'result' => $res);
-
-	call_hooks('parse_atom', $arr);
-	logger('get_atom_elements: author: ' . print_r($author,true),LOGGER_DATA);
-
-	logger('get_atom_elements: ' . print_r($res,true),LOGGER_DATA);
-
-	return $res;
-}
-
-function encode_rel_links($links) {
-	$o = array();
-	if(! ((is_array($links)) && (count($links))))
-		return $o;
-
-	foreach($links as $link) {
-		$l = array();
-		if($link['attribs']['']['rel'])
-			$l['rel'] =  $link['attribs']['']['rel'];
-		if($link['attribs']['']['type'])
-			$l['type'] =  $link['attribs']['']['type'];
-		if($link['attribs']['']['href'])
-			$l['href'] = $link['attribs']['']['href'];
-		if( (x($link['attribs'],NAMESPACE_MEDIA)) && $link['attribs'][NAMESPACE_MEDIA]['width'])
-			$l['width'] = $link['attribs'][NAMESPACE_MEDIA]['width'];
-		if( (x($link['attribs'],NAMESPACE_MEDIA)) && $link['attribs'][NAMESPACE_MEDIA]['height'])
-			$l['height'] = $link['attribs'][NAMESPACE_MEDIA]['height'];
-
-		if($l)
-			$o[] = $l;
-	}
-	return $o;
-}
 
 /**
  * @brief
@@ -3759,577 +3064,6 @@ function mail_store($arr) {
 	return $current_post;
 }
 
-/**
- * @brief Process atom feed and update anything/everything we might need to update.
- *
- * @param array $xml
- *   The (atom) feed to consume - RSS isn't as fully supported but may work for simple feeds.
- * @param $importer
- *   The contact_record (joined to user_record) of the local user who owns this
- *   relationship. It is this person's stuff that is going to be updated.
- * @param $contact
- *   The person who is sending us stuff. If not set, we MAY be processing a "follow" activity
- *   from an external network and MAY create an appropriate contact record. Otherwise, we MUST
- *   have a contact record.
- * @param int $pass by default ($pass = 0) we cannot guarantee that a parent item has been
- *   imported prior to its children being seen in the stream unless we are certain
- *   of how the feed is arranged/ordered.
- *  * With $pass = 1, we only pull parent items out of the stream.
- *  * With $pass = 2, we only pull children (comments/likes).
- *
- * So running this twice, first with pass 1 and then with pass 2 will do the right
- * thing regardless of feed ordering. This won't be adequate in a fully-threaded
- * model where comments can have sub-threads. That would require some massive sorting
- * to get all the feed items into a mostly linear ordering, and might still require
- * recursion.
- */
-function consume_feed($xml, $importer, &$contact, $pass = 0) {
-
-	require_once('library/simplepie/simplepie.inc');
-
-	if(! strlen($xml)) {
-		logger('consume_feed: empty input');
-		return;
-	}
-
-	$sys_expire = intval(get_config('system','default_expire_days'));
-	$chn_expire = intval($importer['channel_expire_days']);
-
-	$expire_days = $sys_expire;
-
-	if(($chn_expire != 0) && ($chn_expire < $sys_expire))
-		$expire_days = $chn_expire;
-
-	// logger('expire_days: ' . $expire_days);
-
-	$feed = new SimplePie();
-	$feed->set_raw_data($xml);
-	$feed->init();
-
-	if($feed->error())
-		logger('consume_feed: Error parsing XML: ' . $feed->error());
-
-	$permalink = $feed->get_permalink();
-
-	// Check at the feed level for updated contact name and/or photo
-
-	// process any deleted entries
-
-	$del_entries = $feed->get_feed_tags(NAMESPACE_TOMB, 'deleted-entry');
-	if(is_array($del_entries) && count($del_entries) && $pass != 2) {
-		foreach($del_entries as $dentry) {
-			$deleted = false;
-			if(isset($dentry['attribs']['']['ref'])) {
-				$mid = $dentry['attribs']['']['ref'];
-				$deleted = true;
-				if(isset($dentry['attribs']['']['when'])) {
-					$when = $dentry['attribs']['']['when'];
-					$when = datetime_convert('UTC','UTC', $when, 'Y-m-d H:i:s');
-				}
-				else
-					$when = datetime_convert('UTC','UTC','now','Y-m-d H:i:s');
-			}
-
-			if($deleted && is_array($contact)) {
-				$r = q("SELECT * from item where mid = '%s' and author_xchan = '%s' and uid = %d limit 1",
-					dbesc(base64url_encode($mid)),
-					dbesc($contact['xchan_hash']),
-					intval($importer['channel_id'])
-				);
-
-				if($r) {
-					$item = $r[0];
-
-					if(! intval($item['item_deleted'])) {
-						logger('consume_feed: deleting item ' . $item['id'] . ' mid=' . base64url_decode($item['mid']), LOGGER_DEBUG);
-						drop_item($item['id'],false);
-					}
-				}
-			}
-		}
-	}
-
-	// Now process the feed
-
-	if($feed->get_item_quantity()) {
-
-		logger('consume_feed: feed item count = ' . $feed->get_item_quantity(), LOGGER_DEBUG);
-
-		$items = $feed->get_items();
-
-		foreach($items as $item) {
-
-			$is_reply = false;
-			$item_id = base64url_encode($item->get_id());
-
-			logger('consume_feed: processing ' . $item_id, LOGGER_DEBUG);
-
-			$rawthread = $item->get_item_tags( NAMESPACE_THREAD,'in-reply-to');
-			if(isset($rawthread[0]['attribs']['']['ref'])) {
-				$is_reply = true;
-				$parent_mid = base64url_encode($rawthread[0]['attribs']['']['ref']);
-			}
-
-			if($is_reply) {
-
-				if($pass == 1)
-					continue;
-
-				// Have we seen it? If not, import it.
-
-				$item_id  = base64url_encode($item->get_id());
-				$author = array();
-				$datarray = get_atom_elements($feed,$item,$author);
-
-				if($contact['xchan_network'] === 'rss') {
-					$datarray['public_policy'] = 'specific';
-					$datarray['comment_policy'] = 'none';
-				}
-
-				if((! x($author,'author_name')) || ($author['author_is_feed']))
-					$author['author_name'] = $contact['xchan_name'];
-				if((! x($author,'author_link')) || ($author['author_is_feed']))
-					$author['author_link'] = $contact['xchan_url'];
-				if((! x($author,'author_photo'))|| ($author['author_is_feed']))
-					$author['author_photo'] = $contact['xchan_photo_m'];
-
-				$datarray['author_xchan'] = '';
-
-				if($author['author_link'] != $contact['xchan_url']) {
-					$x = import_author_unknown(array('name' => $author['author_name'],'url' => $author['author_link'],'photo' => array('src' => $author['author_photo'])));
-					if($x)
-						$datarray['author_xchan'] = $x;
-				}
-				if(! $datarray['author_xchan'])
-					$datarray['author_xchan'] = $contact['xchan_hash'];
-
-				$datarray['owner_xchan'] = $contact['xchan_hash'];
-
-				$r = q("SELECT edited FROM item WHERE mid = '%s' AND uid = %d LIMIT 1",
-					dbesc($item_id),
-					intval($importer['channel_id'])
-				);
-
-
-				// Update content if 'updated' changes
-
-				if($r) {
-					if((x($datarray,'edited') !== false)
-						&& (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {
-
-						// do not accept (ignore) an earlier edit than one we currently have.
-						if(datetime_convert('UTC','UTC',$datarray['edited']) < $r[0]['edited'])
-							continue;
-
-						update_feed_item($importer['channel_id'],$datarray);
-					}
-					continue;
-				}
-
-				$datarray['parent_mid'] = $parent_mid;
-				$datarray['aid'] = $importer['channel_account_id'];
-				$datarray['uid'] = $importer['channel_id'];
-
-				logger('consume_feed: ' . print_r($datarray,true),LOGGER_DATA);
-
-				$xx = item_store($datarray);
-				$r = $xx['item_id'];
-				continue;
-			}
-			else {
-
-				// Head post of a conversation. Have we seen it? If not, import it.
-
-				$item_id  = base64url_encode($item->get_id());
-				$author = array();
-				$datarray = get_atom_elements($feed,$item,$author);
-
-				if($contact['xchan_network'] === 'rss') {
-					$datarray['public_policy'] = 'specific';
-					$datarray['comment_policy'] = 'none';
-				}
-
-
-				if(is_array($contact)) {
-					if((! x($author,'author_name')) || ($author['author_is_feed']))
-						$author['author_name'] = $contact['xchan_name'];
-					if((! x($author,'author_link')) || ($author['author_is_feed']))
-						$author['author_link'] = $contact['xchan_url'];
-					if((! x($author,'author_photo'))|| ($author['author_is_feed']))
-						$author['author_photo'] = $contact['xchan_photo_m'];
-				}
-
-				if((! x($author,'author_name')) || (! x($author,'author_link'))) {
-					logger('consume_feed: no author information! ' . print_r($author,true));
-					continue;
-				}
-
-				$datarray['author_xchan'] = '';
-
-				if(activity_match($datarray['verb'],ACTIVITY_FOLLOW) && $datarray['obj_type'] === ACTIVITY_OBJ_PERSON) {
-					$cb = array('item' => $datarray,'channel' => $importer, 'xchan' => null, 'author' => $author, 'caught' => false);
-					call_hooks('follow_from_feed',$cb);
-					if($cb['caught']) {
-						if($cb['return_code'])
-							http_status_exit($cb['return_code']);
-						continue;
-					}
-				}
-
-				if($author['author_link'] != $contact['xchan_url']) {
-					$x = import_author_unknown(array('name' => $author['author_name'],'url' => $author['author_link'],'photo' => array('src' => $author['author_photo'])));
-					if($x)
-						$datarray['author_xchan'] = $x;
-				}
-				if(! $datarray['author_xchan'])
-					$datarray['author_xchan'] = $contact['xchan_hash'];
-
-				$datarray['owner_xchan'] = $contact['xchan_hash'];
-
-				if(array_key_exists('created',$datarray) && $datarray['created'] != NULL_DATE && $expire_days) {
-					$t1 = $datarray['created'];
-					$t2 = datetime_convert('UTC','UTC','now - ' . $expire_days . 'days');
-					if($t1 < $t2) {
-						logger('feed content older than expiration. Ignoring.', LOGGER_DEBUG, LOG_INFO);
-						continue;
-					}
-				}
-
-
-
-				$r = q("SELECT edited FROM item WHERE mid = '%s' AND uid = %d LIMIT 1",
-					dbesc($item_id),
-					intval($importer['channel_id'])
-				);
-
-				// Update content if 'updated' changes
-
-				if($r) {
-					if((x($datarray,'edited') !== false)
-						&& (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {
-
-						// do not accept (ignore) an earlier edit than one we currently have.
-						if(datetime_convert('UTC','UTC',$datarray['edited']) < $r[0]['edited'])
-							continue;
-
-						update_feed_item($importer['channel_id'],$datarray);
-					}
-
-					continue;
-				}
-
-				$datarray['parent_mid'] = $item_id;
-				$datarray['uid'] = $importer['channel_id'];
-				$datarray['aid'] = $importer['channel_account_id'];
-
-				if(! link_compare($author['owner_link'],$contact['xchan_url'])) {
-					logger('consume_feed: Correcting item owner.', LOGGER_DEBUG);
-					$author['owner_name']   = $contact['name'];
-					$author['owner_link']   = $contact['url'];
-					$author['owner_avatar'] = $contact['thumb'];
-				}
-
-				if(! post_is_importable($datarray,$contact))
-					continue;
-
-				logger('consume_feed: author ' . print_r($author,true),LOGGER_DEBUG);
-
-				logger('consume_feed: ' . print_r($datarray,true),LOGGER_DATA);
-
-				$xx = item_store($datarray);
-				$r = $xx['item_id'];
-				continue;
-			}
-		}
-	}
-}
-
-
-/**
- * @brief Process atom feed and return the first post and structure
- *
- * @param array $xml
- *   The (atom) feed to consume - RSS isn't as fully supported but may work for simple feeds.
- * @param $importer
- *   The contact_record (joined to user_record) of the local user who owns this
- *   relationship. It is this person's stuff that is going to be updated.
- */
-
-function process_salmon_feed($xml, $importer) {
-
-	$ret = array();
-
-	require_once('library/simplepie/simplepie.inc');
-
-	if(! strlen($xml)) {
-		logger('process_feed: empty input');
-		return;
-	}
-
-	$feed = new SimplePie();
-	$feed->set_raw_data($xml);
-	$feed->init();
-
-	if($feed->error())
-		logger('Error parsing XML: ' . $feed->error());
-
-	$permalink = $feed->get_permalink();
-
-	if($feed->get_item_quantity()) {
-
-		// this should be exactly one
-
-		logger('feed item count = ' . $feed->get_item_quantity(), LOGGER_DEBUG);
-
-		$items = $feed->get_items();
-
-		foreach($items as $item) {
-
-			$item_id = base64url_encode($item->get_id());
-
-			logger('processing ' . $item_id, LOGGER_DEBUG);
-
-			$rawthread = $item->get_item_tags( NAMESPACE_THREAD,'in-reply-to');
-			if(isset($rawthread[0]['attribs']['']['ref'])) {
-				$is_reply = true;
-				$parent_mid = base64url_encode($rawthread[0]['attribs']['']['ref']);
-			}
-
-			if($is_reply)
-				$ret['parent_mid'] = $parent_mid;
-
-			$ret['author'] = array();
-
-			$datarray = get_atom_elements($feed,$item,$ret['author']);
-
-			// reset policies which are restricted by default for RSS connections
-			// This item is likely coming from GNU-social via salmon and allows public interaction 
-			$datarray['public_policy'] = '';
-			$datarray['comment_policy'] = '';
-
-			$ret['item'] = $datarray;			
-		}
-	}
-
-	return $ret;
-}
-
-/*
- * Given an xml (atom) feed, find author and hub links
- */
-
-
-function feed_meta($xml) {
-	require_once('library/simplepie/simplepie.inc');
-
-	$ret = array();
-
-    if(! strlen($xml)) {
-        logger('empty input');
-        return $ret;
-    }
-
-    $feed = new SimplePie();
-    $feed->set_raw_data($xml);
-    $feed->init();
-
-    if($feed->error()) {
-        logger('Error parsing XML: ' . $feed->error());
-		return $ret;
-	}
-
-    $ret['hubs'] = $feed->get_links('hub');
-
-//     logger('consume_feed: hubs: ' . print_r($hubs,true), LOGGER_DATA);
-	
-	$author = array();
-
-    $found_author = $feed->get_author();
-    if($found_author) {
-        $author['author_name'] = unxmlify($found_author->get_name());
-        $author['author_link'] = unxmlify($found_author->get_link());
-
-    	$rawauthor = $feed->get_feed_tags(SIMPLEPIE_NAMESPACE_ATOM_10,'author');
-		logger('rawauthor: ' . print_r($rawauthor,true));
-
-	    if($rawauthor) {
-			if($rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) {
-	    	    $base = $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
-    	    	foreach($base as $link) {
-        	    	if(!x($author, 'author_photo') || ! $author['author_photo']) {
-            	    	if($link['attribs']['']['rel'] === 'photo' || $link['attribs']['']['rel'] === 'avatar') {
-                	    	$author['author_photo'] = unxmlify($link['attribs']['']['href']);
-							break;
-						}
-    	        	}
-        		}
-			}
-			if($rawauthor[0]['child'][NAMESPACE_POCO]['displayName'][0]['data'])
-				$author['full_name'] = unxmlify($rawauthor[0]['child'][NAMESPACE_POCO]['displayName'][0]['data']);
-			if($rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data'])
-				$author['author_uri'] = unxmlify($rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data']);
-			
-		}
-    }
-
-    if(substr($author['author_link'],-1,1) == '/')
-        $author['author_link'] = substr($author['author_link'],0,-1);
-
-	$ret['author'] = $author; 
-
-	return $ret;
-}
-
-
-
-function update_feed_item($uid,$datarray) {
-	logger('update_feed_item: not implemented! ' . $uid . ' ' . print_r($datarray,true), LOGGER_DATA);
-}
-
-
-function handle_feed($uid,$abook_id,$url) {
-
-	require_once('include/Contact.php');
-	$channel = channelx_by_n($uid);
-	if(! $channel)
-		return;
-
-	$x = q("select * from abook left join xchan on abook_xchan = xchan_hash where abook_id = %d and abook_channel = %d limit 1",
-		dbesc($abook_id),
-		intval($uid)
-	);
-
-	$recurse = 0;
-	$z = z_fetch_url($url,false,$recurse,array('novalidate' => true));
-
-//logger('handle_feed:' . print_r($z,true));
-
-	if($z['success']) {
-		consume_feed($z['body'],$channel,$x[0],1);
-		consume_feed($z['body'],$channel,$x[0],2);
-	}
-}
-
-
-function atom_author($tag,$name,$uri,$h,$w,$type,$photo) {
-	$o = '';
-	if(! $tag)
-		return $o;
-
-	$name = xmlify($name);
-	$uri = xmlify($uri);
-	$h = intval($h);
-	$w = intval($w);
-	$photo = xmlify($photo);
-
-	$o .= "<$tag>\r\n";
-	$o .= "<name>$name</name>\r\n";
-	$o .= "<uri>$uri</uri>\r\n";
-	$o .= '<link rel="photo"  type="' . $type . '" media:width="' . $w . '" media:height="' . $h . '" href="' . $photo . '" />' . "\r\n";
-	$o .= '<link rel="avatar" type="' . $type . '" media:width="' . $w . '" media:height="' . $h . '" href="' . $photo . '" />' . "\r\n";
-
-	call_hooks('atom_author', $o);
-
-	$o .= "</$tag>\r\n";
-
-	return $o;
-}
-
-function atom_entry($item,$type,$author,$owner,$comment = false,$cid = 0) {
-
-	if(! $item['parent'])
-		return;
-
-	if($item['deleted'])
-		return '<at:deleted-entry ref="' . xmlify($item['mid']) . '" when="' . xmlify(datetime_convert('UTC','UTC',$item['edited'] . '+00:00',ATOM_TIME)) . '" />' . "\r\n";
-
-
-	create_export_photo_body($item);
-
-	if($item['allow_cid'] || $item['allow_gid'] || $item['deny_cid'] || $item['deny_gid'])
-		$body = fix_private_photos($item['body'],$owner['uid'],$item,$cid);
-	else
-		$body = $item['body'];
-
-	$o = "\r\n\r\n<entry>\r\n";
-
-	if(is_array($author))
-		$o .= atom_author('author',$author['xchan_name'],$author['xchan_url'],80,80,$author['xchan_photo_mimetype'],$author['xchan_photo_m']);
-	else
-		$o .= atom_author('author',$item['author']['xchan_name'],$item['author']['xchan_url'],80,80,$item['author']['xchan_photo_mimetype'], $item['author']['xchan_photo_m']);
-
-	$o .= atom_author('zot:owner',$item['owner']['xchan_name'],$item['owner']['xchan_url'],80,80,$item['owner']['xchan_photo_mimetype'],$item['owner']['xchan_photo_m']);
-
-	if(($item['parent'] != $item['id']) || ($item['parent_mid'] !== $item['mid']) || (($item['thr_parent'] !== '') && ($item['thr_parent'] !== $item['mid']))) {
-		$parent_item = (($item['thr_parent']) ? $item['thr_parent'] : $item['parent_mid']);
-		$o .= '<thr:in-reply-to ref="' . z_root() . '/display/' . xmlify($parent_item) . '" type="text/html" href="' .  xmlify($item['plink']) . '" />' . "\r\n";
-	}
-
-	if(activity_match($item['obj_type'],ACTIVITY_OBJ_EVENT) && activity_match($item['verb'],ACTIVITY_POST)) {
-		$obj = ((is_array($item['obj'])) ? $item['object'] : json_decode($item['object'],true));
- 
-		$o .= '<title>' . xmlify($item['title']) . '</title>' . "\r\n";
-		$o .= '<summary xmlns="urn:ietf:params:xml:ns:xcal">' . xmlify(bbcode($obj['title'])) . '</summary>' . "\r\n";
-		$o .= '<dtstart xmlns="urn:ietf:params:xml:ns:xcal">' . datetime_convert('UTC','UTC', $obj['start'],'Ymd\\THis' . (($obj['adjust']) ? '\\Z' : '')) .  '</dtstart>' . "\r\n";
-		$o .= '<dtend xmlns="urn:ietf:params:xml:ns:xcal">' . datetime_convert('UTC','UTC', $obj['finish'],'Ymd\\THis' . (($obj['adjust']) ? '\\Z' : '')) .  '</dtend>' . "\r\n";
-		$o .= '<location xmlns="urn:ietf:params:xml:ns:xcal">' . xmlify(bbcode($obj['location'])) . '</location>' . "\r\n";
-		$o .= '<content type="' . $type . '" >' . xmlify(bbcode($obj['description'])) . '</content>' . "\r\n";
-	}
-	else {
-		$o .= '<title>' . xmlify($item['title']) . '</title>' . "\r\n";
-		$o .= '<content type="' . $type . '" >' . xmlify(prepare_text($body,$item['mimetype'])) . '</content>' . "\r\n";
-	}
-
-	$o .= '<id>' . z_root() . '/display/' . xmlify($item['mid']) . '</id>' . "\r\n";
-	$o .= '<published>' . xmlify(datetime_convert('UTC','UTC',$item['created'] . '+00:00',ATOM_TIME)) . '</published>' . "\r\n";
-	$o .= '<updated>' . xmlify(datetime_convert('UTC','UTC',$item['edited'] . '+00:00',ATOM_TIME)) . '</updated>' . "\r\n";
-
-	$o .= '<link rel="alternate" type="text/html" href="' . xmlify($item['plink']) . '" />' . "\r\n";
-
-	if($item['location']) {
-		$o .= '<zot:location>' . xmlify($item['location']) . '</zot:location>' . "\r\n";
-		$o .= '<poco:address><poco:formatted>' . xmlify($item['location']) . '</poco:formatted></poco:address>' . "\r\n";
-	}
-
-	if($item['coord'])
-		$o .= '<georss:point>' . xmlify($item['coord']) . '</georss:point>' . "\r\n";
-
-	if(($item['item_private']) || strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid']))
-		$o .= '<zot:private>' . (($item['item_private']) ? $item['item_private'] : 1) . '</zot:private>' . "\r\n";
-
-	if($item['app'])
-		$o .= '<statusnet:notice_info local_id="' . $item['id'] . '" source="' . xmlify($item['app']) . '" ></statusnet:notice_info>' . "\r\n";
-
-	$verb = construct_verb($item);
-	$o .= '<as:verb>' . xmlify($verb) . '</as:verb>' . "\r\n";
-	$actobj = construct_activity_object($item);
-	if(strlen($actobj))
-		$o .= $actobj;
-	$actarg = construct_activity_target($item);
-	if(strlen($actarg))
-		$o .= $actarg;
-
-	// FIXME
-//	$tags = item_getfeedtags($item);
-//	if(count($tags)) {
-//		foreach($tags as $t) {
-//			$o .= '<category scheme="X-DFRN:' . xmlify($t[0]) . ':' . xmlify($t[1]) . '" term="' . xmlify($t[2]) . '" />' . "\r\n";
-//		}
-//	}
-
-// FIXME
-//	$o .= item_getfeedattach($item);
-
-//	$mentioned = get_mentions($item,$tags);
-//	if($mentioned)
-//		$o .= $mentioned;
-
-	call_hooks('atom_entry', $o);
-
-	$o .= '</entry>' . "\r\n";
-
-	return $o;
-}
 
 function fix_private_photos($s, $uid, $item = null, $cid = 0) {
 
@@ -5512,90 +4246,6 @@ function comment_local_origin($item) {
 }
 
 
-function gen_asld($items) {
-	$ret = array();
-	if(! $items)
-		return $ret;
-	foreach($items as $item) {
-		$ret[] = i2asld($item);
-	}
-	return $ret;
-}
-
-
-function i2asld($i) {
-
-	if(! $i)
-		return array();
-
-	$ret = array();
-
-	$ret['@context'] = array( 'http://www.w3.org/ns/activitystreams', 'zot' => 'http://purl.org/zot/protocol');
-
-	if($i['verb']) {
-		if(strpos(dirname($i['verb'],'activitystrea.ms/schema/1.0'))) {
-			$ret['@type'] = ucfirst(basename($i['verb']));
-		}
-		elseif(strpos(dirname($i['verb'],'purl.org/zot'))) {
-			$ret['@type'] = 'zot:' . ucfirst(basename($i['verb']));
-		}
-	}
-	$ret['@id'] = $i['plink'];
-
-	$ret['published'] = datetime_convert('UTC','UTC',$i['created'],ATOM_TIME);
-
-	// we need to pass the parent into this
-//	if($i['id'] != $i['parent'] && $i['obj_type'] === ACTIVITY_OBJ_NOTE) {
-//		$ret['inReplyTo'] = asencode_note
-//	}
-
-	if($i['obj_type'] === ACTIVITY_OBJ_NOTE)
-		$ret['object'] = asencode_note($i);
-
-
-	$ret['actor'] = asencode_person($i['author']);
-
-	
-	return $ret;
-	
-}
-
-function asencode_note($i) {
-
-	$ret = array();
-
-	$ret['@type'] = 'Note';
-	$ret['@id'] = $i['plink'];
-	if($i['title'])
-		$ret['title'] = bbcode($i['title']);
-	$ret['content'] = bbcode($i['body']);
-	$ret['zot:owner'] = asencode_person($i['owner']);
-	$ret['published'] = datetime_convert('UTC','UTC',$i['created'],ATOM_TIME);
-	if($i['created'] !== $i['edited'])
-		$ret['updated'] = datetime_convert('UTC','UTC',$i['edited'],ATOM_TIME);
-
-	return $ret;
-}
-
-
-function asencode_person($p) {
-	$ret = array();
-	$ret['@type'] = 'Person';
-	$ret['@id'] = 'acct:' . $p['xchan_addr'];
-	$ret['displayName'] = $p['xchan_name'];
-	$ret['icon'] = array(
-		'@type' => 'Link',
-		'mediaType' => $p['xchan_photo_mimetype'],
-		'href' => $p['xchan_photo_m']
-	);
-	$ret['url'] = array(
-		'@type' => 'Link',
-		'mediaType' => 'text/html',
-		'href' => $p['xchan_url']
-	);
-
-	return $ret;
-}
 
 
 function send_profile_photo_activity($channel,$photo,$profile) {
diff --git a/include/network.php b/include/network.php
index 9f68d3df3..f80244f8f 100644
--- a/include/network.php
+++ b/include/network.php
@@ -1168,6 +1168,10 @@ function discover_by_webbie($webbie) {
 	if(! $x)
 		$probe_old = true;
 
+
+	if((! $dfrn) && (! $has_salmon)) 
+		$probe_old = true;
+
 	if($probe_old) {
 		$y = old_webfinger($webbie);			
 		if($y) {
diff --git a/include/zot.php b/include/zot.php
index 157354afa..8adc74ffa 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1953,6 +1953,16 @@ function remove_community_tag($sender, $arr, $uid) {
  */
 function update_imported_item($sender, $item, $orig, $uid) {
 
+	// If this is a comment being updated, remove any privacy information
+	// so that item_store_update will set it from the original.
+
+	if($item['mid'] !== $item['parent_mid']) {
+		unset($item['allow_cid']);
+		unset($item['allow_gid']);
+		unset($item['deny_cid']);
+		unset($item['deny_gid']);
+		unset($item['item_private']);
+	}
 
 	$x = item_store_update($item);
 
diff --git a/index.php b/index.php
index 1178881ba..5a25e67c7 100755
--- a/index.php
+++ b/index.php
@@ -62,7 +62,8 @@ if(! App::$install) {
 	load_config('system');
 	load_config('feature');
 
-	\Zotlabs\Web\Session::init();
+	App::$session = new \Zotlabs\Web\Session();
+	App::$session->init();
 	load_hooks();
 	call_hooks('init_1');
 
@@ -84,7 +85,13 @@ if(! App::$install) {
  *
  */
 
-\Zotlabs\Web\Session::start();
+  if(App::$session) {
+	App::$session->start();
+  }
+  else {
+	session_start();
+	register_shutdown_function('session_write_close');
+  }
 
 /**
  * Language was set earlier, but we can over-ride it in the session.
@@ -136,12 +143,6 @@ else
 
 nav_set_selected('nothing');
 
-$arr = array('app_menu' => App::get_apps());
-
-call_hooks('app_menu', $arr);
-
-App::set_apps($arr['app_menu']);
-
 $Router = new Zotlabs\Web\Router($a);
 
 /* initialise content region */
diff --git a/util/hmessages.po b/util/hmessages.po
index 8b3d88f07..3dd812ae3 100644
--- a/util/hmessages.po
+++ b/util/hmessages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 00:01-0700\n"
+"POT-Creation-Date: 2016-05-13 00:02-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,7 +21,7 @@ msgstr ""
 msgid "parent"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2635
+#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2632
 msgid "Collection"
 msgstr ""
 
@@ -45,16 +45,16 @@ msgstr ""
 msgid "Schedule Outbox"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Module/Photos.php:797
-#: ../../Zotlabs/Module/Photos.php:1242 ../../include/apps.php:441
-#: ../../include/apps.php:516 ../../include/widgets.php:1506
-#: ../../include/conversation.php:1037
+#: ../../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
 msgid "Unknown"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:226 ../../Zotlabs/Module/Fbrowser.php:85
-#: ../../include/apps.php:167 ../../include/conversation.php:1649
-#: ../../include/nav.php:93
+#: ../../include/nav.php:93 ../../include/conversation.php:1645
+#: ../../include/apps.php:167
 msgid "Files"
 msgstr ""
 
@@ -67,22 +67,22 @@ msgid "Shared"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:230 ../../Zotlabs/Storage/Browser.php:303
-#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Layouts.php:182
+#: ../../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:188
+#: ../../Zotlabs/Module/Webpages.php:186
 msgid "Create"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:231 ../../Zotlabs/Storage/Browser.php:305
 #: ../../Zotlabs/Module/Cover_photo.php:357
-#: ../../Zotlabs/Module/Photos.php:824 ../../Zotlabs/Module/Photos.php:1366
+#: ../../Zotlabs/Module/Photos.php:825 ../../Zotlabs/Module/Photos.php:1367
 #: ../../Zotlabs/Module/Profile_photo.php:368 ../../include/widgets.php:1519
 msgid "Upload"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:235 ../../Zotlabs/Module/Admin.php:1180
-#: ../../Zotlabs/Module/Chat.php:245 ../../Zotlabs/Module/Settings.php:590
-#: ../../Zotlabs/Module/Settings.php:616
+#: ../../Zotlabs/Storage/Browser.php:235 ../../Zotlabs/Module/Admin.php:1208
+#: ../../Zotlabs/Module/Chat.php:245 ../../Zotlabs/Module/Settings.php:592
+#: ../../Zotlabs/Module/Settings.php:618
 #: ../../Zotlabs/Module/Sharedwithme.php:99
 msgid "Name"
 msgstr ""
@@ -101,35 +101,35 @@ msgstr ""
 msgid "Last Modified"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:240 ../../Zotlabs/Module/Admin.php:1796
-#: ../../Zotlabs/Module/Blocks.php:159
+#: ../../Zotlabs/Storage/Browser.php:240 ../../Zotlabs/Module/Admin.php:2075
+#: ../../Zotlabs/Module/Blocks.php:157
 #: ../../Zotlabs/Module/Connections.php:290
 #: ../../Zotlabs/Module/Connections.php:310
-#: ../../Zotlabs/Module/Editblock.php:136
+#: ../../Zotlabs/Module/Editblock.php:109
 #: ../../Zotlabs/Module/Editlayout.php:113
 #: ../../Zotlabs/Module/Editpost.php:84
-#: ../../Zotlabs/Module/Editwebpage.php:181
+#: ../../Zotlabs/Module/Editwebpage.php:146
 #: ../../Zotlabs/Module/Layouts.php:190 ../../Zotlabs/Module/Menu.php:112
-#: ../../Zotlabs/Module/Settings.php:650 ../../Zotlabs/Module/Thing.php:260
-#: ../../Zotlabs/Module/Webpages.php:189 ../../include/identity.php:937
-#: ../../include/identity.php:941 ../../include/apps.php:291
-#: ../../include/ItemObject.php:100 ../../include/menu.php:108
-#: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36
+#: ../../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
 msgid "Edit"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:241 ../../Zotlabs/Module/Admin.php:1015
-#: ../../Zotlabs/Module/Admin.php:1174 ../../Zotlabs/Module/Admin.php:1797
-#: ../../Zotlabs/Module/Blocks.php:161
+#: ../../Zotlabs/Storage/Browser.php:241 ../../Zotlabs/Module/Admin.php:1043
+#: ../../Zotlabs/Module/Admin.php:1202 ../../Zotlabs/Module/Admin.php:2076
+#: ../../Zotlabs/Module/Blocks.php:159
 #: ../../Zotlabs/Module/Connections.php:263
 #: ../../Zotlabs/Module/Connedit.php:573
-#: ../../Zotlabs/Module/Editblock.php:176
+#: ../../Zotlabs/Module/Editblock.php:134
 #: ../../Zotlabs/Module/Editlayout.php:136
-#: ../../Zotlabs/Module/Editwebpage.php:221 ../../Zotlabs/Module/Group.php:177
-#: ../../Zotlabs/Module/Photos.php:1172 ../../Zotlabs/Module/Settings.php:651
-#: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Module/Webpages.php:191
-#: ../../include/apps.php:292 ../../include/ItemObject.php:120
-#: ../../include/conversation.php:657
+#: ../../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
 msgid "Delete"
 msgstr ""
 
@@ -160,24 +160,24 @@ msgstr ""
 #: ../../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:104
-#: ../../Zotlabs/Module/Channel.php:224 ../../Zotlabs/Module/Channel.php:264
+#: ../../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/Module/Connedit.php:366
 #: ../../Zotlabs/Module/Cover_photo.php:277
 #: ../../Zotlabs/Module/Cover_photo.php:290
-#: ../../Zotlabs/Module/Editblock.php:66
+#: ../../Zotlabs/Module/Editblock.php:67
 #: ../../Zotlabs/Module/Editlayout.php:67
 #: ../../Zotlabs/Module/Editlayout.php:90 ../../Zotlabs/Module/Editpost.php:17
-#: ../../Zotlabs/Module/Editwebpage.php:68
+#: ../../Zotlabs/Module/Editwebpage.php:69
 #: ../../Zotlabs/Module/Editwebpage.php:90
 #: ../../Zotlabs/Module/Editwebpage.php:105
-#: ../../Zotlabs/Module/Editwebpage.php:129
-#: ../../Zotlabs/Module/Events.php:264 ../../Zotlabs/Module/Filestorage.php:22
-#: ../../Zotlabs/Module/Filestorage.php:77
-#: ../../Zotlabs/Module/Filestorage.php:92
-#: ../../Zotlabs/Module/Filestorage.php:119
+#: ../../Zotlabs/Module/Editwebpage.php:127
+#: ../../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/Id.php:76 ../../Zotlabs/Module/Invite.php:17
 #: ../../Zotlabs/Module/Invite.php:91 ../../Zotlabs/Module/Item.php:210
@@ -187,12 +187,12 @@ msgstr ""
 #: ../../Zotlabs/Module/Locs.php:87 ../../Zotlabs/Module/Mail.php:130
 #: ../../Zotlabs/Module/Manage.php:10 ../../Zotlabs/Module/Menu.php:78
 #: ../../Zotlabs/Module/Message.php:20 ../../Zotlabs/Module/Mitem.php:115
-#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Network.php:16
+#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Network.php:17
 #: ../../Zotlabs/Module/New_channel.php:77
 #: ../../Zotlabs/Module/New_channel.php:104
 #: ../../Zotlabs/Module/Notifications.php:70 ../../Zotlabs/Module/Page.php:35
 #: ../../Zotlabs/Module/Page.php:90 ../../Zotlabs/Module/Pdledit.php:26
-#: ../../Zotlabs/Module/Photos.php:74 ../../Zotlabs/Module/Poke.php:137
+#: ../../Zotlabs/Module/Photos.php:75 ../../Zotlabs/Module/Poke.php:137
 #: ../../Zotlabs/Module/Profile.php:68 ../../Zotlabs/Module/Profile.php:76
 #: ../../Zotlabs/Module/Profile_photo.php:256
 #: ../../Zotlabs/Module/Profile_photo.php:269
@@ -200,16 +200,16 @@ msgstr ""
 #: ../../Zotlabs/Module/Rate.php:115 ../../Zotlabs/Module/Register.php:77
 #: ../../Zotlabs/Module/Regmod.php:21
 #: ../../Zotlabs/Module/Service_limits.php:11
-#: ../../Zotlabs/Module/Settings.php:570 ../../Zotlabs/Module/Setup.php:238
+#: ../../Zotlabs/Module/Settings.php:572 ../../Zotlabs/Module/Setup.php:238
 #: ../../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/Viewsrc.php:18 ../../Zotlabs/Module/Webpages.php:73
+#: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Webpages.php:74
 #: ../../include/photos.php:29 ../../include/chat.php:133
-#: ../../include/items.php:4705 ../../include/attach.php:141
+#: ../../include/items.php:3439 ../../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
@@ -242,12 +242,12 @@ msgid "Welcome %s. Remote authentication successful."
 msgstr ""
 
 #: ../../Zotlabs/Module/Achievements.php:15 ../../Zotlabs/Module/Blocks.php:33
-#: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Editblock.php:30
+#: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Editblock.php:31
 #: ../../Zotlabs/Module/Editlayout.php:31
-#: ../../Zotlabs/Module/Editwebpage.php:32
-#: ../../Zotlabs/Module/Filestorage.php:58 ../../Zotlabs/Module/Hcard.php:12
+#: ../../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:33 ../../include/identity.php:837
+#: ../../Zotlabs/Module/Webpages.php:34 ../../include/identity.php:837
 msgid "Requested profile is not available."
 msgstr ""
 
@@ -263,183 +263,195 @@ msgstr ""
 msgid "RSS"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:58
+#: ../../Zotlabs/Module/Admin.php:77
 msgid "Theme settings updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:145 ../../Zotlabs/Module/Admin.php:1211
-#: ../../Zotlabs/Module/Admin.php:1463 ../../Zotlabs/Module/Display.php:44
-#: ../../Zotlabs/Module/Filestorage.php:31 ../../Zotlabs/Module/Thing.php:89
-#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:4626
+#: ../../Zotlabs/Module/Admin.php:164 ../../Zotlabs/Module/Admin.php:1239
+#: ../../Zotlabs/Module/Admin.php:1541 ../../Zotlabs/Module/Display.php:44
+#: ../../Zotlabs/Module/Filestorage.php:33 ../../Zotlabs/Module/Thing.php:89
+#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:3360
 msgid "Item not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:178
+#: ../../Zotlabs/Module/Admin.php:197
 msgid "# Accounts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:179
+#: ../../Zotlabs/Module/Admin.php:198
 msgid "# blocked accounts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:180
+#: ../../Zotlabs/Module/Admin.php:199
 msgid "# expired accounts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:181
+#: ../../Zotlabs/Module/Admin.php:200
 msgid "# expiring accounts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:192
+#: ../../Zotlabs/Module/Admin.php:211
 msgid "# Channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:193
+#: ../../Zotlabs/Module/Admin.php:212
 msgid "# primary"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:194
+#: ../../Zotlabs/Module/Admin.php:213
 msgid "# clones"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:200
+#: ../../Zotlabs/Module/Admin.php:219
 msgid "Message queues"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:216 ../../Zotlabs/Module/Admin.php:462
-#: ../../Zotlabs/Module/Admin.php:683 ../../Zotlabs/Module/Admin.php:727
-#: ../../Zotlabs/Module/Admin.php:1006 ../../Zotlabs/Module/Admin.php:1170
-#: ../../Zotlabs/Module/Admin.php:1285 ../../Zotlabs/Module/Admin.php:1348
-#: ../../Zotlabs/Module/Admin.php:1514 ../../Zotlabs/Module/Admin.php:1548
-#: ../../Zotlabs/Module/Admin.php:1633
+#: ../../Zotlabs/Module/Admin.php:236
+msgid "Your software should be updated"
+msgstr ""
+
+#: ../../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:1592 ../../Zotlabs/Module/Admin.php:1626
+#: ../../Zotlabs/Module/Admin.php:1711
 msgid "Administration"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:217
+#: ../../Zotlabs/Module/Admin.php:242
 msgid "Summary"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:220
+#: ../../Zotlabs/Module/Admin.php:245
 msgid "Registered accounts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:221 ../../Zotlabs/Module/Admin.php:687
+#: ../../Zotlabs/Module/Admin.php:246 ../../Zotlabs/Module/Admin.php:715
 msgid "Pending registrations"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:222
+#: ../../Zotlabs/Module/Admin.php:247
 msgid "Registered channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:223 ../../Zotlabs/Module/Admin.php:688
+#: ../../Zotlabs/Module/Admin.php:248 ../../Zotlabs/Module/Admin.php:716
 msgid "Active plugins"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:224
+#: ../../Zotlabs/Module/Admin.php:249
 msgid "Version"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:345
+#: ../../Zotlabs/Module/Admin.php:250
+msgid "Repository version (master)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:251
+msgid "Repository version (dev)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:373
 msgid "Site settings updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:372 ../../include/text.php:2856
+#: ../../Zotlabs/Module/Admin.php:400 ../../include/text.php:2853
 msgid "Default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:382 ../../Zotlabs/Module/Settings.php:796
+#: ../../Zotlabs/Module/Admin.php:410 ../../Zotlabs/Module/Settings.php:798
 msgid "mobile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:384
+#: ../../Zotlabs/Module/Admin.php:412
 msgid "experimental"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:386
+#: ../../Zotlabs/Module/Admin.php:414
 msgid "unsupported"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:431 ../../Zotlabs/Module/Api.php:89
+#: ../../Zotlabs/Module/Admin.php:459 ../../Zotlabs/Module/Api.php:89
 #: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Connedit.php:657
-#: ../../Zotlabs/Module/Events.php:458 ../../Zotlabs/Module/Events.php:459
-#: ../../Zotlabs/Module/Events.php:468
-#: ../../Zotlabs/Module/Filestorage.php:155
-#: ../../Zotlabs/Module/Filestorage.php:163 ../../Zotlabs/Module/Menu.php:100
+#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:460
+#: ../../Zotlabs/Module/Events.php:469
+#: ../../Zotlabs/Module/Filestorage.php:157
+#: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Menu.php:100
 #: ../../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:665
+#: ../../Zotlabs/Module/Mitem.php:233 ../../Zotlabs/Module/Photos.php:666
 #: ../../Zotlabs/Module/Profiles.php:651 ../../Zotlabs/Module/Removeme.php:64
-#: ../../Zotlabs/Module/Settings.php:579 ../../include/dir_fns.php:141
+#: ../../Zotlabs/Module/Settings.php:581 ../../include/dir_fns.php:141
 #: ../../include/dir_fns.php:142 ../../include/dir_fns.php:143
 #: ../../view/theme/redbasic/php/config.php:105
 #: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1619
 msgid "No"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:432
+#: ../../Zotlabs/Module/Admin.php:460
 msgid "Yes - with approval"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:433 ../../Zotlabs/Module/Api.php:88
-#: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Events.php:458
-#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:468
-#: ../../Zotlabs/Module/Filestorage.php:155
-#: ../../Zotlabs/Module/Filestorage.php:163 ../../Zotlabs/Module/Menu.php:100
+#: ../../Zotlabs/Module/Admin.php:461 ../../Zotlabs/Module/Api.php:88
+#: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Events.php:459
+#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:469
+#: ../../Zotlabs/Module/Filestorage.php:157
+#: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Menu.php:100
 #: ../../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:665
+#: ../../Zotlabs/Module/Mitem.php:233 ../../Zotlabs/Module/Photos.php:666
 #: ../../Zotlabs/Module/Profiles.php:651 ../../Zotlabs/Module/Removeme.php:64
-#: ../../Zotlabs/Module/Settings.php:579 ../../include/dir_fns.php:141
+#: ../../Zotlabs/Module/Settings.php:581 ../../include/dir_fns.php:141
 #: ../../include/dir_fns.php:142 ../../include/dir_fns.php:143
 #: ../../view/theme/redbasic/php/config.php:105
 #: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1619
 msgid "Yes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:438
+#: ../../Zotlabs/Module/Admin.php:466
 msgid "My site is not a public server"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:439
+#: ../../Zotlabs/Module/Admin.php:467
 msgid "My site has paid access only"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:440
+#: ../../Zotlabs/Module/Admin.php:468
 msgid "My site has free access only"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:441
+#: ../../Zotlabs/Module/Admin.php:469
 msgid "My site offers free accounts with optional paid upgrades"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:463 ../../include/widgets.php:1383
+#: ../../Zotlabs/Module/Admin.php:491 ../../include/widgets.php:1383
 msgid "Site"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:464 ../../Zotlabs/Module/Admin.php:660
-#: ../../Zotlabs/Module/Admin.php:743 ../../Zotlabs/Module/Admin.php:1008
-#: ../../Zotlabs/Module/Admin.php:1172 ../../Zotlabs/Module/Admin.php:1350
-#: ../../Zotlabs/Module/Admin.php:1550 ../../Zotlabs/Module/Admin.php:1635
-#: ../../Zotlabs/Module/Admin.php:1799 ../../Zotlabs/Module/Appman.php:125
+#: ../../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:1628 ../../Zotlabs/Module/Admin.php:1713
+#: ../../Zotlabs/Module/Admin.php:2078 ../../Zotlabs/Module/Appman.php:125
 #: ../../Zotlabs/Module/Cal.php:341 ../../Zotlabs/Module/Chat.php:194
 #: ../../Zotlabs/Module/Chat.php:236 ../../Zotlabs/Module/Connect.php:97
-#: ../../Zotlabs/Module/Connedit.php:734 ../../Zotlabs/Module/Events.php:472
-#: ../../Zotlabs/Module/Events.php:669
-#: ../../Zotlabs/Module/Filestorage.php:160
+#: ../../Zotlabs/Module/Connedit.php:734 ../../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/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/Mood.php:139 ../../Zotlabs/Module/Pconfig.php:107
-#: ../../Zotlabs/Module/Pdledit.php:66 ../../Zotlabs/Module/Photos.php:676
-#: ../../Zotlabs/Module/Photos.php:1051 ../../Zotlabs/Module/Photos.php:1091
-#: ../../Zotlabs/Module/Photos.php:1209 ../../Zotlabs/Module/Poke.php:186
+#: ../../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:172
-#: ../../Zotlabs/Module/Settings.php:588 ../../Zotlabs/Module/Settings.php:701
-#: ../../Zotlabs/Module/Settings.php:729 ../../Zotlabs/Module/Settings.php:752
-#: ../../Zotlabs/Module/Settings.php:840
-#: ../../Zotlabs/Module/Settings.php:1032 ../../Zotlabs/Module/Setup.php:335
+#: ../../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/Sources.php:149 ../../Zotlabs/Module/Thing.php:316
 #: ../../Zotlabs/Module/Thing.php:362 ../../Zotlabs/Module/Xchan.php:15
@@ -449,875 +461,928 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:465 ../../Zotlabs/Module/Register.php:245
+#: ../../Zotlabs/Module/Admin.php:493 ../../Zotlabs/Module/Register.php:245
 msgid "Registration"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:466
+#: ../../Zotlabs/Module/Admin.php:494
 msgid "File upload"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:467
+#: ../../Zotlabs/Module/Admin.php:495
 msgid "Policies"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:468 ../../include/contact_widgets.php:19
+#: ../../Zotlabs/Module/Admin.php:496 ../../include/contact_widgets.php:19
 msgid "Advanced"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:472
+#: ../../Zotlabs/Module/Admin.php:500
 msgid "Site name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:473
+#: ../../Zotlabs/Module/Admin.php:501
 msgid "Banner/Logo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:474
+#: ../../Zotlabs/Module/Admin.php:502
 msgid "Administrator Information"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:474
+#: ../../Zotlabs/Module/Admin.php:502
 msgid ""
 "Contact information for site administrators.  Displayed on siteinfo page.  "
 "BBCode can be used here"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:475
+#: ../../Zotlabs/Module/Admin.php:503
 msgid "System language"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:476
+#: ../../Zotlabs/Module/Admin.php:504
 msgid "System theme"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:476
+#: ../../Zotlabs/Module/Admin.php:504
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:477
+#: ../../Zotlabs/Module/Admin.php:505
 msgid "Mobile system theme"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:477
+#: ../../Zotlabs/Module/Admin.php:505
 msgid "Theme for mobile devices"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:479
+#: ../../Zotlabs/Module/Admin.php:507
 msgid "Allow Feeds as Connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:479
+#: ../../Zotlabs/Module/Admin.php:507
 msgid "(Heavy system resource usage)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:480
+#: ../../Zotlabs/Module/Admin.php:508
 msgid "Maximum image size"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:480
+#: ../../Zotlabs/Module/Admin.php:508
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:481
+#: ../../Zotlabs/Module/Admin.php:509
 msgid "Does this site allow new member registration?"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:482
+#: ../../Zotlabs/Module/Admin.php:510
 msgid "Invitation only"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:482
+#: ../../Zotlabs/Module/Admin.php:510
 msgid ""
 "Only allow new member registrations with an invitation code. Above register "
 "policy must be set to Yes."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:483
+#: ../../Zotlabs/Module/Admin.php:511
 msgid "Which best describes the types of account offered by this hub?"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:484
+#: ../../Zotlabs/Module/Admin.php:512
 msgid "Register text"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:484
+#: ../../Zotlabs/Module/Admin.php:512
 msgid "Will be displayed prominently on the registration page."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:485
+#: ../../Zotlabs/Module/Admin.php:513
 msgid "Site homepage to show visitors (default: login box)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:485
+#: ../../Zotlabs/Module/Admin.php:513
 msgid ""
 "example: 'public' to show public stream, 'page/sys/home' to show a system "
 "webpage called 'home' or 'include:home.html' to include a file."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:486
+#: ../../Zotlabs/Module/Admin.php:514
 msgid "Preserve site homepage URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:486
+#: ../../Zotlabs/Module/Admin.php:514
 msgid ""
 "Present the site homepage in a frame at the original location instead of "
 "redirecting"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:487
+#: ../../Zotlabs/Module/Admin.php:515
 msgid "Accounts abandoned after x days"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:487
+#: ../../Zotlabs/Module/Admin.php:515
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:488
+#: ../../Zotlabs/Module/Admin.php:516
 msgid "Allowed friend domains"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:488
+#: ../../Zotlabs/Module/Admin.php:516
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:489
+#: ../../Zotlabs/Module/Admin.php:517
 msgid "Allowed email domains"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:489
+#: ../../Zotlabs/Module/Admin.php:517
 msgid ""
 "Comma separated list of domains which are allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:490
+#: ../../Zotlabs/Module/Admin.php:518
 msgid "Not allowed email domains"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:490
+#: ../../Zotlabs/Module/Admin.php:518
 msgid ""
 "Comma separated list of domains which are not allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains, unless allowed domains have been defined."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:491
+#: ../../Zotlabs/Module/Admin.php:519
 msgid "Verify Email Addresses"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:491
+#: ../../Zotlabs/Module/Admin.php:519
 msgid ""
 "Check to verify email addresses used in account registration (recommended)."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:492
+#: ../../Zotlabs/Module/Admin.php:520
 msgid "Force publish"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:492
+#: ../../Zotlabs/Module/Admin.php:520
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:493
+#: ../../Zotlabs/Module/Admin.php:521
 msgid "Import Public Streams"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:493
+#: ../../Zotlabs/Module/Admin.php:521
 msgid ""
 "Import and allow access to public content pulled from other sites. Warning: "
 "this content is unmoderated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:494
+#: ../../Zotlabs/Module/Admin.php:522
 msgid "Login on Homepage"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:494
+#: ../../Zotlabs/Module/Admin.php:522
 msgid ""
 "Present a login box to visitors on the home page if no other content has "
 "been configured."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:495
+#: ../../Zotlabs/Module/Admin.php:523
 msgid "Enable context help"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:495
+#: ../../Zotlabs/Module/Admin.php:523
 msgid ""
 "Display contextual help for the current page when the help button is pressed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:497
+#: ../../Zotlabs/Module/Admin.php:525
 msgid "Directory Server URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:497
+#: ../../Zotlabs/Module/Admin.php:525
 msgid "Default directory server"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:499
+#: ../../Zotlabs/Module/Admin.php:527
 msgid "Proxy user"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:500
+#: ../../Zotlabs/Module/Admin.php:528
 msgid "Proxy URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:501
+#: ../../Zotlabs/Module/Admin.php:529
 msgid "Network timeout"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:501
+#: ../../Zotlabs/Module/Admin.php:529
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:502
+#: ../../Zotlabs/Module/Admin.php:530
 msgid "Delivery interval"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:502
+#: ../../Zotlabs/Module/Admin.php:530
 msgid ""
 "Delay background delivery processes by this many seconds to reduce system "
 "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
 "for large dedicated servers."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:503
+#: ../../Zotlabs/Module/Admin.php:531
 msgid "Deliveries per process"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:503
+#: ../../Zotlabs/Module/Admin.php:531
 msgid ""
 "Number of deliveries to attempt in a single operating system process. Adjust "
 "if necessary to tune system performance. Recommend: 1-5."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:504
+#: ../../Zotlabs/Module/Admin.php:532
 msgid "Poll interval"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:504
+#: ../../Zotlabs/Module/Admin.php:532
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:505
+#: ../../Zotlabs/Module/Admin.php:533
 msgid "Maximum Load Average"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:505
+#: ../../Zotlabs/Module/Admin.php:533
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:506
+#: ../../Zotlabs/Module/Admin.php:534
 msgid "Expiration period in days for imported (grid/network) content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:506
+#: ../../Zotlabs/Module/Admin.php:534
 msgid "0 for no expiration of imported content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:649 ../../Zotlabs/Module/Admin.php:650
-#: ../../Zotlabs/Module/Settings.php:720
+#: ../../Zotlabs/Module/Admin.php:677 ../../Zotlabs/Module/Admin.php:678
+#: ../../Zotlabs/Module/Settings.php:722
 msgid "Off"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:649 ../../Zotlabs/Module/Admin.php:650
-#: ../../Zotlabs/Module/Settings.php:720
+#: ../../Zotlabs/Module/Admin.php:677 ../../Zotlabs/Module/Admin.php:678
+#: ../../Zotlabs/Module/Settings.php:722
 msgid "On"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:650
+#: ../../Zotlabs/Module/Admin.php:678
 #, php-format
 msgid "Lock feature %s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:658
+#: ../../Zotlabs/Module/Admin.php:686
 msgid "Manage Additional Features"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:675
+#: ../../Zotlabs/Module/Admin.php:703
 msgid "No server found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:682 ../../Zotlabs/Module/Admin.php:1020
+#: ../../Zotlabs/Module/Admin.php:710 ../../Zotlabs/Module/Admin.php:1048
 msgid "ID"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:682
+#: ../../Zotlabs/Module/Admin.php:710
 msgid "for channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:682
+#: ../../Zotlabs/Module/Admin.php:710
 msgid "on server"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:682 ../../Zotlabs/Module/Connections.php:270
+#: ../../Zotlabs/Module/Admin.php:710 ../../Zotlabs/Module/Connections.php:270
 msgid "Status"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:684
+#: ../../Zotlabs/Module/Admin.php:712
 msgid "Server"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:718
+#: ../../Zotlabs/Module/Admin.php:746
 msgid ""
 "By default, unfiltered HTML is allowed in embedded media. This is inherently "
 "insecure."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:721
+#: ../../Zotlabs/Module/Admin.php:749
 msgid ""
 "The recommended setting is to only allow unfiltered HTML from the following "
 "sites:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:722
+#: ../../Zotlabs/Module/Admin.php:750
 msgid ""
 "https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/"
 "<br />https://vimeo.com/<br />https://soundcloud.com/<br />"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:723
+#: ../../Zotlabs/Module/Admin.php:751
 msgid ""
 "All other embedded content will be filtered, <strong>unless</strong> "
 "embedded content from that site is explicitly blocked."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:728 ../../include/widgets.php:1386
+#: ../../Zotlabs/Module/Admin.php:756 ../../include/widgets.php:1386
 msgid "Security"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:730
+#: ../../Zotlabs/Module/Admin.php:758
 msgid "Block public"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:730
+#: ../../Zotlabs/Module/Admin.php:758
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently authenticated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:731
+#: ../../Zotlabs/Module/Admin.php:759
 msgid "Set \"Transport Security\" HTTP header"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:732
+#: ../../Zotlabs/Module/Admin.php:760
 msgid "Set \"Content Security Policy\" HTTP header"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:733
+#: ../../Zotlabs/Module/Admin.php:761
 msgid "Allow communications only from these sites"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:733
+#: ../../Zotlabs/Module/Admin.php:761
 msgid ""
 "One site per line. Leave empty to allow communication from anywhere by "
 "default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:734
+#: ../../Zotlabs/Module/Admin.php:762
 msgid "Block communications from these sites"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:735
+#: ../../Zotlabs/Module/Admin.php:763
 msgid "Allow communications only from these channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:735
+#: ../../Zotlabs/Module/Admin.php:763
 msgid ""
 "One channel (hash) per line. Leave empty to allow from any channel by default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:736
+#: ../../Zotlabs/Module/Admin.php:764
 msgid "Block communications from these channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:737
+#: ../../Zotlabs/Module/Admin.php:765
 msgid "Only allow embeds from secure (SSL) websites and links."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:738
+#: ../../Zotlabs/Module/Admin.php:766
 msgid "Allow unfiltered embedded HTML content only from these domains"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:738
+#: ../../Zotlabs/Module/Admin.php:766
 msgid "One site per line. By default embedded content is filtered."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:739
+#: ../../Zotlabs/Module/Admin.php:767
 msgid "Block embedded HTML from these domains"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:757
+#: ../../Zotlabs/Module/Admin.php:785
 msgid "Update has been marked successful"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:767
+#: ../../Zotlabs/Module/Admin.php:795
 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:770
+#: ../../Zotlabs/Module/Admin.php:798
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:774
+#: ../../Zotlabs/Module/Admin.php:802
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:777
+#: ../../Zotlabs/Module/Admin.php:805
 #, php-format
 msgid "Update function %s could not be found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:793
+#: ../../Zotlabs/Module/Admin.php:821
 msgid "No failed updates."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:797
+#: ../../Zotlabs/Module/Admin.php:825
 msgid "Failed Updates"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:799
+#: ../../Zotlabs/Module/Admin.php:827
 msgid "Mark success (if update was manually applied)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:800
+#: ../../Zotlabs/Module/Admin.php:828
 msgid "Attempt to execute this update step automatically"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:831
+#: ../../Zotlabs/Module/Admin.php:859
 msgid "Queue Statistics"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:832
+#: ../../Zotlabs/Module/Admin.php:860
 msgid "Total Entries"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:833
+#: ../../Zotlabs/Module/Admin.php:861
 msgid "Priority"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:834
+#: ../../Zotlabs/Module/Admin.php:862
 msgid "Destination URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:835
+#: ../../Zotlabs/Module/Admin.php:863
 msgid "Mark hub permanently offline"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:836
+#: ../../Zotlabs/Module/Admin.php:864
 msgid "Empty queue for this hub"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:837
+#: ../../Zotlabs/Module/Admin.php:865
 msgid "Last known contact"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:873
+#: ../../Zotlabs/Module/Admin.php:901
 #, php-format
 msgid "%s account blocked/unblocked"
 msgid_plural "%s account blocked/unblocked"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../Zotlabs/Module/Admin.php:881
+#: ../../Zotlabs/Module/Admin.php:909
 #, php-format
 msgid "%s account deleted"
 msgid_plural "%s accounts deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../Zotlabs/Module/Admin.php:917
+#: ../../Zotlabs/Module/Admin.php:945
 msgid "Account not found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:929
+#: ../../Zotlabs/Module/Admin.php:957
 #, php-format
 msgid "Account '%s' deleted"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:937
+#: ../../Zotlabs/Module/Admin.php:965
 #, php-format
 msgid "Account '%s' blocked"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:945
+#: ../../Zotlabs/Module/Admin.php:973
 #, php-format
 msgid "Account '%s' unblocked"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1007 ../../Zotlabs/Module/Admin.php:1019
+#: ../../Zotlabs/Module/Admin.php:1035 ../../Zotlabs/Module/Admin.php:1047
 msgid "Users"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1009 ../../Zotlabs/Module/Admin.php:1173
+#: ../../Zotlabs/Module/Admin.php:1037 ../../Zotlabs/Module/Admin.php:1201
 msgid "select all"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1010
+#: ../../Zotlabs/Module/Admin.php:1038
 msgid "User registrations waiting for confirm"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1011
+#: ../../Zotlabs/Module/Admin.php:1039
 msgid "Request date"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1011 ../../Zotlabs/Module/Admin.php:1020
+#: ../../Zotlabs/Module/Admin.php:1039 ../../Zotlabs/Module/Admin.php:1048
 #: ../../Zotlabs/Module/Id.php:17 ../../Zotlabs/Module/Id.php:18
 #: ../../include/contact_selectors.php:81 ../../boot.php:1617
 msgid "Email"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1012
+#: ../../Zotlabs/Module/Admin.php:1040
 msgid "No registrations."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1013
+#: ../../Zotlabs/Module/Admin.php:1041
 #: ../../Zotlabs/Module/Connections.php:275
 msgid "Approve"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1014
+#: ../../Zotlabs/Module/Admin.php:1042
 msgid "Deny"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1016 ../../Zotlabs/Module/Connedit.php:541
+#: ../../Zotlabs/Module/Admin.php:1044 ../../Zotlabs/Module/Connedit.php:541
 msgid "Block"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1017 ../../Zotlabs/Module/Connedit.php:541
+#: ../../Zotlabs/Module/Admin.php:1045 ../../Zotlabs/Module/Connedit.php:541
 msgid "Unblock"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1020 ../../include/group.php:267
+#: ../../Zotlabs/Module/Admin.php:1048 ../../include/group.php:267
 msgid "All Channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1020
+#: ../../Zotlabs/Module/Admin.php:1048
 msgid "Register date"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1020
+#: ../../Zotlabs/Module/Admin.php:1048
 msgid "Last login"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1020
+#: ../../Zotlabs/Module/Admin.php:1048
 msgid "Expires"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1020
+#: ../../Zotlabs/Module/Admin.php:1048
 msgid "Service Class"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1022
+#: ../../Zotlabs/Module/Admin.php:1050
 msgid ""
 "Selected accounts will be deleted!\\n\\nEverything these accounts had posted "
 "on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1023
+#: ../../Zotlabs/Module/Admin.php:1051
 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 ""
 
-#: ../../Zotlabs/Module/Admin.php:1059
+#: ../../Zotlabs/Module/Admin.php:1087
 #, php-format
 msgid "%s channel censored/uncensored"
 msgid_plural "%s channels censored/uncensored"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../Zotlabs/Module/Admin.php:1068
+#: ../../Zotlabs/Module/Admin.php:1096
 #, php-format
 msgid "%s channel code allowed/disallowed"
 msgid_plural "%s channels code allowed/disallowed"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../Zotlabs/Module/Admin.php:1075
+#: ../../Zotlabs/Module/Admin.php:1103
 #, php-format
 msgid "%s channel deleted"
 msgid_plural "%s channels deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../Zotlabs/Module/Admin.php:1095
+#: ../../Zotlabs/Module/Admin.php:1123
 msgid "Channel not found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1106
+#: ../../Zotlabs/Module/Admin.php:1134
 #, php-format
 msgid "Channel '%s' deleted"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1118
+#: ../../Zotlabs/Module/Admin.php:1146
 #, php-format
 msgid "Channel '%s' censored"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1118
+#: ../../Zotlabs/Module/Admin.php:1146
 #, php-format
 msgid "Channel '%s' uncensored"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1129
+#: ../../Zotlabs/Module/Admin.php:1157
 #, php-format
 msgid "Channel '%s' code allowed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1129
+#: ../../Zotlabs/Module/Admin.php:1157
 #, php-format
 msgid "Channel '%s' code disallowed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1171 ../../include/widgets.php:1385
+#: ../../Zotlabs/Module/Admin.php:1199 ../../include/widgets.php:1385
 msgid "Channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1175
+#: ../../Zotlabs/Module/Admin.php:1203
 msgid "Censor"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1176
+#: ../../Zotlabs/Module/Admin.php:1204
 msgid "Uncensor"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1177
+#: ../../Zotlabs/Module/Admin.php:1205
 msgid "Allow Code"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1178
+#: ../../Zotlabs/Module/Admin.php:1206
 msgid "Disallow Code"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1179 ../../include/conversation.php:1621
+#: ../../Zotlabs/Module/Admin.php:1207 ../../include/conversation.php:1617
 msgid "Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1180
+#: ../../Zotlabs/Module/Admin.php:1208
 msgid "UID"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1180 ../../Zotlabs/Module/Locs.php:118
+#: ../../Zotlabs/Module/Admin.php:1208 ../../Zotlabs/Module/Locs.php:118
 #: ../../Zotlabs/Module/Profiles.php:469
 msgid "Address"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1182
+#: ../../Zotlabs/Module/Admin.php:1210
 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 ""
 
-#: ../../Zotlabs/Module/Admin.php:1183
+#: ../../Zotlabs/Module/Admin.php:1211
 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 ""
 
-#: ../../Zotlabs/Module/Admin.php:1240
+#: ../../Zotlabs/Module/Admin.php:1268
 #, php-format
 msgid "Plugin %s disabled."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1244
+#: ../../Zotlabs/Module/Admin.php:1272
 #, php-format
 msgid "Plugin %s enabled."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1254 ../../Zotlabs/Module/Admin.php:1487
+#: ../../Zotlabs/Module/Admin.php:1282 ../../Zotlabs/Module/Admin.php:1565
 msgid "Disable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1257 ../../Zotlabs/Module/Admin.php:1489
+#: ../../Zotlabs/Module/Admin.php:1285 ../../Zotlabs/Module/Admin.php:1567
 msgid "Enable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1286 ../../Zotlabs/Module/Admin.php:1349
+#: ../../Zotlabs/Module/Admin.php:1314 ../../Zotlabs/Module/Admin.php:1404
 #: ../../include/widgets.php:1388
 msgid "Plugins"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1287 ../../Zotlabs/Module/Admin.php:1516
+#: ../../Zotlabs/Module/Admin.php:1315 ../../Zotlabs/Module/Admin.php:1594
 msgid "Toggle"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1288 ../../Zotlabs/Module/Admin.php:1517
-#: ../../include/apps.php:166 ../../include/widgets.php:638
-#: ../../include/nav.php:208
+#: ../../Zotlabs/Module/Admin.php:1316 ../../Zotlabs/Module/Admin.php:1595
+#: ../../include/widgets.php:638 ../../include/nav.php:208
+#: ../../include/apps.php:166
 msgid "Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1295 ../../Zotlabs/Module/Admin.php:1526
+#: ../../Zotlabs/Module/Admin.php:1323 ../../Zotlabs/Module/Admin.php:1604
 msgid "Author: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1296 ../../Zotlabs/Module/Admin.php:1527
+#: ../../Zotlabs/Module/Admin.php:1324 ../../Zotlabs/Module/Admin.php:1605
 msgid "Maintainer: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1297
+#: ../../Zotlabs/Module/Admin.php:1325
 msgid "Minimum project version: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1298
+#: ../../Zotlabs/Module/Admin.php:1326
 msgid "Maximum project version: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1299
+#: ../../Zotlabs/Module/Admin.php:1327
 msgid "Minimum PHP version: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1300
+#: ../../Zotlabs/Module/Admin.php:1328
 msgid "Requires: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1301 ../../Zotlabs/Module/Admin.php:1354
+#: ../../Zotlabs/Module/Admin.php:1329 ../../Zotlabs/Module/Admin.php:1409
 msgid "Disabled - version incompatibility"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1452
+#: ../../Zotlabs/Module/Admin.php:1378
+msgid "Enter the public git repository URL of the plugin repo."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1379
+msgid "Plugin repo git URL"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1380
+msgid "Custom repo name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1380
+msgid "(optional)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1381
+msgid "Download Plugin Repo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1388
+msgid "Install new repo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1389 ../../include/apps.php:284
+msgid "Install"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1390 ../../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
+msgid "Cancel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1411
+msgid "Add Plugin Repo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1417 ../../Zotlabs/Module/Settings.php:77
+#: ../../Zotlabs/Module/Settings.php:616 ../../include/apps.php:284
+msgid "Update"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1418
+msgid "Switch branch"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1419 ../../Zotlabs/Module/Photos.php:998
+#: ../../Zotlabs/Module/Tagrm.php:137
+msgid "Remove"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1530
 msgid "No themes found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1508
+#: ../../Zotlabs/Module/Admin.php:1586
 msgid "Screenshot"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1515 ../../Zotlabs/Module/Admin.php:1549
+#: ../../Zotlabs/Module/Admin.php:1593 ../../Zotlabs/Module/Admin.php:1627
 #: ../../include/widgets.php:1389
 msgid "Themes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1554
+#: ../../Zotlabs/Module/Admin.php:1632
 msgid "[Experimental]"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1555
+#: ../../Zotlabs/Module/Admin.php:1633
 msgid "[Unsupported]"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1579
+#: ../../Zotlabs/Module/Admin.php:1657
 msgid "Log settings updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1634 ../../include/widgets.php:1410
+#: ../../Zotlabs/Module/Admin.php:1712 ../../include/widgets.php:1410
 #: ../../include/widgets.php:1420
 msgid "Logs"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1636
+#: ../../Zotlabs/Module/Admin.php:1714
 msgid "Clear"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1642
+#: ../../Zotlabs/Module/Admin.php:1720
 msgid "Debugging"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1643
+#: ../../Zotlabs/Module/Admin.php:1721
 msgid "Log file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1643
+#: ../../Zotlabs/Module/Admin.php:1721
 msgid ""
 "Must be writable by web server. Relative to your Red top-level directory."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1644
+#: ../../Zotlabs/Module/Admin.php:1722
 msgid "Log level"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1711
+#: ../../Zotlabs/Module/Admin.php:1990
 msgid "New Profile Field"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1712 ../../Zotlabs/Module/Admin.php:1732
+#: ../../Zotlabs/Module/Admin.php:1991 ../../Zotlabs/Module/Admin.php:2011
 msgid "Field nickname"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1712 ../../Zotlabs/Module/Admin.php:1732
+#: ../../Zotlabs/Module/Admin.php:1991 ../../Zotlabs/Module/Admin.php:2011
 msgid "System name of field"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1713 ../../Zotlabs/Module/Admin.php:1733
+#: ../../Zotlabs/Module/Admin.php:1992 ../../Zotlabs/Module/Admin.php:2012
 msgid "Input type"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1714 ../../Zotlabs/Module/Admin.php:1734
+#: ../../Zotlabs/Module/Admin.php:1993 ../../Zotlabs/Module/Admin.php:2013
 msgid "Field Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1714 ../../Zotlabs/Module/Admin.php:1734
+#: ../../Zotlabs/Module/Admin.php:1993 ../../Zotlabs/Module/Admin.php:2013
 msgid "Label on profile pages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1715 ../../Zotlabs/Module/Admin.php:1735
+#: ../../Zotlabs/Module/Admin.php:1994 ../../Zotlabs/Module/Admin.php:2014
 msgid "Help text"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1715 ../../Zotlabs/Module/Admin.php:1735
+#: ../../Zotlabs/Module/Admin.php:1994 ../../Zotlabs/Module/Admin.php:2014
 msgid "Additional info (optional)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1716 ../../Zotlabs/Module/Admin.php:1736
+#: ../../Zotlabs/Module/Admin.php:1995 ../../Zotlabs/Module/Admin.php:2015
 #: ../../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
 msgid "Save"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1725
+#: ../../Zotlabs/Module/Admin.php:2004
 msgid "Field definition not found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1731
+#: ../../Zotlabs/Module/Admin.php:2010
 msgid "Edit Profile Field"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1789 ../../include/widgets.php:1391
+#: ../../Zotlabs/Module/Admin.php:2068 ../../include/widgets.php:1391
 msgid "Profile Fields"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1790
+#: ../../Zotlabs/Module/Admin.php:2069
 msgid "Basic Profile Fields"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1791
+#: ../../Zotlabs/Module/Admin.php:2070
 msgid "Advanced Profile Fields"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1791
+#: ../../Zotlabs/Module/Admin.php:2070
 msgid "(In addition to basic fields)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1793
+#: ../../Zotlabs/Module/Admin.php:2072
 msgid "All available fields"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1794
+#: ../../Zotlabs/Module/Admin.php:2073
 msgid "Custom Fields"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1798
+#: ../../Zotlabs/Module/Admin.php:2077
 msgid "Create Custom Field"
 msgstr ""
 
@@ -1364,7 +1429,7 @@ msgid "Name of app"
 msgstr ""
 
 #: ../../Zotlabs/Module/Appman.php:114 ../../Zotlabs/Module/Appman.php:115
-#: ../../Zotlabs/Module/Events.php:448 ../../Zotlabs/Module/Events.php:453
+#: ../../Zotlabs/Module/Events.php:449 ../../Zotlabs/Module/Events.php:454
 #: ../../Zotlabs/Module/Profiles.php:713 ../../Zotlabs/Module/Profiles.php:717
 #: ../../include/datetime.php:246
 msgid "Required"
@@ -1374,7 +1439,7 @@ msgstr ""
 msgid "Location (URL) of app"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:116 ../../Zotlabs/Module/Events.php:461
+#: ../../Zotlabs/Module/Appman.php:116 ../../Zotlabs/Module/Events.php:462
 #: ../../Zotlabs/Module/Rbmark.php:101
 msgid "Description"
 msgstr ""
@@ -1421,38 +1486,39 @@ msgstr ""
 msgid "Channel not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Blocks.php:99 ../../Zotlabs/Module/Blocks.php:154
+#: ../../Zotlabs/Module/Blocks.php:97 ../../Zotlabs/Module/Blocks.php:152
+#: ../../Zotlabs/Module/Editblock.php:108
 msgid "Block Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Blocks.php:153 ../../include/text.php:2280
+#: ../../Zotlabs/Module/Blocks.php:151 ../../include/text.php:2277
 msgid "Blocks"
 msgstr ""
 
-#: ../../Zotlabs/Module/Blocks.php:155
+#: ../../Zotlabs/Module/Blocks.php:153
 msgid "Block Title"
 msgstr ""
 
-#: ../../Zotlabs/Module/Blocks.php:156 ../../Zotlabs/Module/Layouts.php:188
-#: ../../Zotlabs/Module/Menu.php:114 ../../Zotlabs/Module/Webpages.php:200
+#: ../../Zotlabs/Module/Blocks.php:154 ../../Zotlabs/Module/Layouts.php:188
+#: ../../Zotlabs/Module/Menu.php:114 ../../Zotlabs/Module/Webpages.php:198
 #: ../../include/page_widgets.php:44
 msgid "Created"
 msgstr ""
 
-#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Layouts.php:189
-#: ../../Zotlabs/Module/Menu.php:115 ../../Zotlabs/Module/Webpages.php:201
+#: ../../Zotlabs/Module/Blocks.php:155 ../../Zotlabs/Module/Layouts.php:189
+#: ../../Zotlabs/Module/Menu.php:115 ../../Zotlabs/Module/Webpages.php:199
 #: ../../include/page_widgets.php:45
 msgid "Edited"
 msgstr ""
 
-#: ../../Zotlabs/Module/Blocks.php:160 ../../Zotlabs/Module/Layouts.php:191
-#: ../../Zotlabs/Module/Photos.php:1071 ../../Zotlabs/Module/Webpages.php:190
-#: ../../include/conversation.php:1218
+#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Layouts.php:191
+#: ../../Zotlabs/Module/Photos.php:1072 ../../Zotlabs/Module/Webpages.php:188
+#: ../../include/conversation.php:1214
 msgid "Share"
 msgstr ""
 
-#: ../../Zotlabs/Module/Blocks.php:165 ../../Zotlabs/Module/Layouts.php:195
-#: ../../Zotlabs/Module/Pubsites.php:46 ../../Zotlabs/Module/Webpages.php:195
+#: ../../Zotlabs/Module/Blocks.php:163 ../../Zotlabs/Module/Layouts.php:195
+#: ../../Zotlabs/Module/Pubsites.php:46 ../../Zotlabs/Module/Webpages.php:193
 #: ../../include/page_widgets.php:39
 msgid "View"
 msgstr ""
@@ -1473,70 +1539,65 @@ msgstr ""
 msgid "Permissions denied."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cal.php:262 ../../Zotlabs/Module/Events.php:585
+#: ../../Zotlabs/Module/Cal.php:262 ../../Zotlabs/Module/Events.php:588
 msgid "l, F j"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cal.php:311 ../../Zotlabs/Module/Events.php:634
+#: ../../Zotlabs/Module/Cal.php:311 ../../Zotlabs/Module/Events.php:637
 #: ../../include/text.php:1743
 msgid "Link to Source"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cal.php:334 ../../Zotlabs/Module/Events.php:662
+#: ../../Zotlabs/Module/Cal.php:334 ../../Zotlabs/Module/Events.php:665
 msgid "Edit Event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cal.php:334 ../../Zotlabs/Module/Events.php:662
+#: ../../Zotlabs/Module/Cal.php:334 ../../Zotlabs/Module/Events.php:665
 msgid "Create Event"
 msgstr ""
 
 #: ../../Zotlabs/Module/Cal.php:335 ../../Zotlabs/Module/Cal.php:342
-#: ../../Zotlabs/Module/Events.php:663 ../../Zotlabs/Module/Events.php:670
-#: ../../Zotlabs/Module/Photos.php:948
+#: ../../Zotlabs/Module/Events.php:666 ../../Zotlabs/Module/Events.php:673
+#: ../../Zotlabs/Module/Photos.php:949
 msgid "Previous"
 msgstr ""
 
 #: ../../Zotlabs/Module/Cal.php:336 ../../Zotlabs/Module/Cal.php:343
-#: ../../Zotlabs/Module/Events.php:664 ../../Zotlabs/Module/Events.php:671
-#: ../../Zotlabs/Module/Photos.php:957 ../../Zotlabs/Module/Setup.php:290
+#: ../../Zotlabs/Module/Events.php:667 ../../Zotlabs/Module/Events.php:674
+#: ../../Zotlabs/Module/Photos.php:958 ../../Zotlabs/Module/Setup.php:290
 msgid "Next"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cal.php:337 ../../Zotlabs/Module/Events.php:665
+#: ../../Zotlabs/Module/Cal.php:337 ../../Zotlabs/Module/Events.php:668
 #: ../../include/widgets.php:755
 msgid "Export"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cal.php:340 ../../Zotlabs/Module/Events.php:668
+#: ../../Zotlabs/Module/Cal.php:340 ../../Zotlabs/Module/Events.php:671
 #: ../../include/widgets.php:756
 msgid "Import"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cal.php:344 ../../Zotlabs/Module/Events.php:672
+#: ../../Zotlabs/Module/Cal.php:344 ../../Zotlabs/Module/Events.php:675
 msgid "Today"
 msgstr ""
 
-#: ../../Zotlabs/Module/Channel.php:28 ../../Zotlabs/Module/Chat.php:23
+#: ../../Zotlabs/Module/Channel.php:29 ../../Zotlabs/Module/Chat.php:23
 msgid "You must be logged in to see this page."
 msgstr ""
 
-#: ../../Zotlabs/Module/Channel.php:40
+#: ../../Zotlabs/Module/Channel.php:41
 msgid "Posts and comments"
 msgstr ""
 
-#: ../../Zotlabs/Module/Channel.php:41
+#: ../../Zotlabs/Module/Channel.php:42
 msgid "Only posts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Channel.php:101
+#: ../../Zotlabs/Module/Channel.php:102
 msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr ""
 
-#: ../../Zotlabs/Module/Channel.php:135 ../../Zotlabs/Module/Network.php:173
-#: ../../Zotlabs/Module/Rpost.php:118
-msgid "Public"
-msgstr ""
-
 #: ../../Zotlabs/Module/Chat.php:179
 msgid "Room not found"
 msgstr ""
@@ -1562,19 +1623,19 @@ msgid "Bookmark this room"
 msgstr ""
 
 #: ../../Zotlabs/Module/Chat.php:203 ../../Zotlabs/Module/Mail.php:206
-#: ../../Zotlabs/Module/Mail.php:320 ../../include/conversation.php:1186
+#: ../../Zotlabs/Module/Mail.php:320 ../../include/conversation.php:1182
 msgid "Please enter a link URL:"
 msgstr ""
 
 #: ../../Zotlabs/Module/Chat.php:204 ../../Zotlabs/Module/Mail.php:259
 #: ../../Zotlabs/Module/Mail.php:389 ../../include/ItemObject.php:715
-#: ../../include/conversation.php:1266
+#: ../../include/conversation.php:1262
 msgid "Encrypt text"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Editblock.php:144
-#: ../../Zotlabs/Module/Editwebpage.php:188 ../../Zotlabs/Module/Mail.php:253
-#: ../../Zotlabs/Module/Mail.php:383 ../../include/conversation.php:1141
+#: ../../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
 msgid "Insert web link"
 msgstr ""
 
@@ -1594,10 +1655,10 @@ msgstr ""
 msgid "Expiration of chats (minutes)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:233 ../../Zotlabs/Module/Filestorage.php:151
-#: ../../Zotlabs/Module/Photos.php:670 ../../Zotlabs/Module/Photos.php:1044
+#: ../../Zotlabs/Module/Chat.php:233 ../../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:266
+#: ../../include/acl_selectors.php:285
 msgid "Permissions"
 msgstr ""
 
@@ -1610,7 +1671,7 @@ msgstr ""
 msgid "No chatrooms available"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:250 ../../Zotlabs/Module/Manage.php:141
+#: ../../Zotlabs/Module/Chat.php:250 ../../Zotlabs/Module/Manage.php:143
 #: ../../Zotlabs/Module/Profiles.php:782
 msgid "Create New"
 msgstr ""
@@ -1712,7 +1773,7 @@ msgstr ""
 
 #: ../../Zotlabs/Module/Connections.php:76
 #: ../../Zotlabs/Module/Connections.php:86 ../../Zotlabs/Module/Menu.php:116
-#: ../../include/conversation.php:1545
+#: ../../include/conversation.php:1541
 msgid "New"
 msgstr ""
 
@@ -1802,15 +1863,15 @@ msgstr ""
 msgid "Recent activity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:302 ../../include/apps.php:159
-#: ../../include/text.php:863 ../../include/nav.php:186
+#: ../../Zotlabs/Module/Connections.php:302 ../../include/nav.php:186
+#: ../../include/text.php:863 ../../include/apps.php:159
 msgid "Connections"
 msgstr ""
 
 #: ../../Zotlabs/Module/Connections.php:306 ../../Zotlabs/Module/Search.php:44
-#: ../../include/acl_selectors.php:259 ../../include/apps.php:179
+#: ../../include/acl_selectors.php:278 ../../include/nav.php:165
 #: ../../include/text.php:933 ../../include/text.php:945
-#: ../../include/nav.php:165
+#: ../../include/apps.php:179
 msgid "Search"
 msgstr ""
 
@@ -1866,8 +1927,8 @@ msgstr ""
 msgid "Connection has been removed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:520 ../../include/apps.php:170
-#: ../../include/conversation.php:959 ../../include/nav.php:86
+#: ../../Zotlabs/Module/Connedit.php:520 ../../include/nav.php:86
+#: ../../include/conversation.php:959 ../../include/apps.php:170
 msgid "View Profile"
 msgstr ""
 
@@ -1957,9 +2018,9 @@ msgstr ""
 msgid "Family"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:595 ../../Zotlabs/Module/Settings.php:340
-#: ../../Zotlabs/Module/Settings.php:344 ../../Zotlabs/Module/Settings.php:345
-#: ../../Zotlabs/Module/Settings.php:348 ../../Zotlabs/Module/Settings.php:359
+#: ../../Zotlabs/Module/Connedit.php:595 ../../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/identity.php:389 ../../include/identity.php:390
 #: ../../include/identity.php:397 ../../include/profile_selectors.php:80
 #: ../../include/widgets.php:495
@@ -1998,7 +2059,7 @@ msgstr ""
 msgid "Connection Default Permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:705 ../../include/items.php:5193
+#: ../../Zotlabs/Module/Connedit.php:705 ../../include/items.php:3927
 #, php-format
 msgid "Connection: %s"
 msgstr ""
@@ -2144,25 +2205,25 @@ msgstr ""
 msgid "Unable to process image."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:5621
+#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4271
 msgid "female"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:5622
+#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4272
 #, php-format
 msgid "%1$s updated her %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:5623
+#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:4273
 msgid "male"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:5624
+#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4274
 #, php-format
 msgid "%1$s updated his %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:5626
+#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4276
 #, php-format
 msgid "%1$s updated their %2$s"
 msgstr ""
@@ -2194,7 +2255,7 @@ msgstr ""
 
 #: ../../Zotlabs/Module/Cover_photo.php:361
 #: ../../Zotlabs/Module/Profile_photo.php:374
-#: ../../Zotlabs/Module/Settings.php:983
+#: ../../Zotlabs/Module/Settings.php:985
 msgid "or"
 msgstr ""
 
@@ -2223,12 +2284,8 @@ msgstr ""
 msgid "Done Editing"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dav.php:127
-msgid "$Projectname channel"
-msgstr ""
-
 #: ../../Zotlabs/Module/Directory.php:63 ../../Zotlabs/Module/Display.php:21
-#: ../../Zotlabs/Module/Photos.php:521 ../../Zotlabs/Module/Ratings.php:86
+#: ../../Zotlabs/Module/Photos.php:522 ../../Zotlabs/Module/Ratings.php:86
 #: ../../Zotlabs/Module/Search.php:17
 #: ../../Zotlabs/Module/Viewconnections.php:21
 msgid "Public access denied."
@@ -2258,8 +2315,8 @@ msgid "Age:"
 msgstr ""
 
 #: ../../Zotlabs/Module/Directory.php:311 ../../include/identity.php:1029
-#: ../../include/bb2diaspora.php:509 ../../include/event.php:52
-#: ../../include/text.php:1481
+#: ../../include/event.php:52 ../../include/text.php:1481
+#: ../../include/bb2diaspora.php:509
 msgid "Location:"
 msgstr ""
 
@@ -2358,7 +2415,7 @@ msgstr ""
 #: ../../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:423
+#: ../../Zotlabs/Module/Subthread.php:62 ../../include/items.php:383
 #: ../../index.php:173
 msgid "Permission denied"
 msgstr ""
@@ -2420,89 +2477,17 @@ msgstr ""
 msgid "mail delivered"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editblock.php:78 ../../Zotlabs/Module/Editblock.php:94
+#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95
 #: ../../Zotlabs/Module/Editlayout.php:79 ../../Zotlabs/Module/Editpost.php:24
 #: ../../Zotlabs/Module/Editwebpage.php:81
 msgid "Item not found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editblock.php:118
-msgid "Delete block?"
-msgstr ""
-
-#: ../../Zotlabs/Module/Editblock.php:137
-#: ../../Zotlabs/Module/Editwebpage.php:182 ../../include/ItemObject.php:704
-#: ../../include/conversation.php:1225
-msgid "Bold"
-msgstr ""
-
-#: ../../Zotlabs/Module/Editblock.php:138
-#: ../../Zotlabs/Module/Editwebpage.php:183 ../../include/ItemObject.php:705
-#: ../../include/conversation.php:1226
-msgid "Italic"
-msgstr ""
-
-#: ../../Zotlabs/Module/Editblock.php:139
-#: ../../Zotlabs/Module/Editwebpage.php:184 ../../include/ItemObject.php:706
-#: ../../include/conversation.php:1227
-msgid "Underline"
-msgstr ""
-
-#: ../../Zotlabs/Module/Editblock.php:140
-#: ../../Zotlabs/Module/Editwebpage.php:185 ../../include/ItemObject.php:707
-#: ../../include/conversation.php:1228
-msgid "Quote"
-msgstr ""
-
-#: ../../Zotlabs/Module/Editblock.php:141
-#: ../../Zotlabs/Module/Editwebpage.php:186 ../../include/ItemObject.php:708
-#: ../../include/conversation.php:1229
-msgid "Code"
-msgstr ""
-
-#: ../../Zotlabs/Module/Editblock.php:143
-#: ../../Zotlabs/Module/Editwebpage.php:187 ../../Zotlabs/Module/Mail.php:252
-#: ../../Zotlabs/Module/Mail.php:382 ../../include/conversation.php:1230
-msgid "Attach file"
-msgstr ""
-
-#: ../../Zotlabs/Module/Editblock.php:147
-#: ../../Zotlabs/Module/Editwebpage.php:191
-#: ../../Zotlabs/Module/Events.php:470 ../../include/conversation.php:1242
-msgid "Permission settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Editblock.php:155
-#: ../../Zotlabs/Module/Editwebpage.php:200
-msgid "Public post"
-msgstr ""
-
-#: ../../Zotlabs/Module/Editblock.php:158
-#: ../../Zotlabs/Module/Editwebpage.php:205
-#: ../../include/conversation.php:1238
+#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1234
 msgid "Title (optional)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editblock.php:161
-#: ../../Zotlabs/Module/Editwebpage.php:207
-#: ../../include/conversation.php:1241
-msgid "Categories (optional, comma-separated list)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Editblock.php:162
-#: ../../Zotlabs/Module/Editwebpage.php:208
-msgid "Example: bob@example.com, mary@example.com"
-msgstr ""
-
-#: ../../Zotlabs/Module/Editblock.php:167
-#: ../../Zotlabs/Module/Editwebpage.php:212
-#: ../../Zotlabs/Module/Events.php:469 ../../Zotlabs/Module/Photos.php:1092
-#: ../../Zotlabs/Module/Webpages.php:196 ../../include/ItemObject.php:712
-#: ../../include/conversation.php:1197 ../../include/page_widgets.php:40
-msgid "Preview"
-msgstr ""
-
-#: ../../Zotlabs/Module/Editblock.php:175
+#: ../../Zotlabs/Module/Editblock.php:133
 msgid "Edit Block"
 msgstr ""
 
@@ -2524,157 +2509,156 @@ msgstr ""
 msgid "Item is not editable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editpost.php:105 ../../Zotlabs/Module/Rpost.php:134
+#: ../../Zotlabs/Module/Editpost.php:106 ../../Zotlabs/Module/Rpost.php:135
 msgid "Edit post"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editwebpage.php:157
-msgid "Delete webpage?"
+#: ../../Zotlabs/Module/Editwebpage.php:143
+msgid "Page link"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editwebpage.php:177
-msgid "Page link title"
-msgstr ""
-
-#: ../../Zotlabs/Module/Editwebpage.php:220
+#: ../../Zotlabs/Module/Editwebpage.php:169
 msgid "Edit Webpage"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:25
+#: ../../Zotlabs/Module/Events.php:26
 msgid "Calendar entries imported."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:27
+#: ../../Zotlabs/Module/Events.php:28
 msgid "No calendar entries found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:104
+#: ../../Zotlabs/Module/Events.php:105
 msgid "Event can not end before it has started."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:106 ../../Zotlabs/Module/Events.php:115
-#: ../../Zotlabs/Module/Events.php:135
+#: ../../Zotlabs/Module/Events.php:107 ../../Zotlabs/Module/Events.php:116
+#: ../../Zotlabs/Module/Events.php:136
 msgid "Unable to generate preview."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:113
+#: ../../Zotlabs/Module/Events.php:114
 msgid "Event title and start time are required."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:133 ../../Zotlabs/Module/Events.php:258
+#: ../../Zotlabs/Module/Events.php:134 ../../Zotlabs/Module/Events.php:259
 msgid "Event not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:253 ../../Zotlabs/Module/Like.php:373
-#: ../../Zotlabs/Module/Tagger.php:51 ../../include/event.php:915
-#: ../../include/text.php:1972 ../../include/conversation.php:123
+#: ../../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
 msgid "event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:448
+#: ../../Zotlabs/Module/Events.php:449
 msgid "Edit event title"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:448
+#: ../../Zotlabs/Module/Events.php:449
 msgid "Event title"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:450
+#: ../../Zotlabs/Module/Events.php:451
 msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:451
+#: ../../Zotlabs/Module/Events.php:452
 msgid "Edit Category"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:451
+#: ../../Zotlabs/Module/Events.php:452
 msgid "Category"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:454
+#: ../../Zotlabs/Module/Events.php:455
 msgid "Edit start date and time"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:454
+#: ../../Zotlabs/Module/Events.php:455
 msgid "Start date and time"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:455 ../../Zotlabs/Module/Events.php:458
+#: ../../Zotlabs/Module/Events.php:456 ../../Zotlabs/Module/Events.php:459
 msgid "Finish date and time are not known or not relevant"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:457
+#: ../../Zotlabs/Module/Events.php:458
 msgid "Edit finish date and time"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:457
+#: ../../Zotlabs/Module/Events.php:458
 msgid "Finish date and time"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:460
+#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:461
 msgid "Adjust for viewer timezone"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:459
+#: ../../Zotlabs/Module/Events.php:460
 msgid ""
 "Important for events that happen in a particular place. Not practical for "
 "global holidays."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:461
+#: ../../Zotlabs/Module/Events.php:462
 msgid "Edit Description"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:463
+#: ../../Zotlabs/Module/Events.php:464
 msgid "Edit Location"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:463 ../../Zotlabs/Module/Locs.php:117
+#: ../../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
 msgid "Location"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:466 ../../Zotlabs/Module/Events.php:468
+#: ../../Zotlabs/Module/Events.php:467 ../../Zotlabs/Module/Events.php:469
 msgid "Share this event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:473
+#: ../../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
+msgid "Preview"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:471 ../../include/conversation.php:1238
+msgid "Permission settings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:476
 msgid "Advanced Options"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:607
+#: ../../Zotlabs/Module/Events.php:610
 msgid "Edit event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:609
+#: ../../Zotlabs/Module/Events.php:612
 msgid "Delete event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:643
+#: ../../Zotlabs/Module/Events.php:646
 msgid "calendar"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:703
+#: ../../Zotlabs/Module/Events.php:706
 msgid "Event removed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:706
+#: ../../Zotlabs/Module/Events.php:709
 msgid "Failed to remove event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Fbrowser.php:29 ../../include/apps.php:171
-#: ../../include/conversation.php:1642 ../../include/nav.php:92
+#: ../../Zotlabs/Module/Fbrowser.php:29 ../../include/nav.php:92
+#: ../../include/conversation.php:1638 ../../include/apps.php:171
 msgid "Photos"
 msgstr ""
 
-#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88
-#: ../../Zotlabs/Module/Settings.php:589 ../../Zotlabs/Module/Settings.php:615
-#: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138
-#: ../../include/conversation.php:1269
-msgid "Cancel"
-msgstr ""
-
 #: ../../Zotlabs/Module/Ffsapi.php:12
 msgid "Share content from Firefox to $Projectname"
 msgstr ""
@@ -2691,47 +2675,47 @@ msgstr ""
 msgid "- select -"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:86
+#: ../../Zotlabs/Module/Filestorage.php:88
 msgid "Permission Denied."
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:102
+#: ../../Zotlabs/Module/Filestorage.php:104
 msgid "File not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:145
+#: ../../Zotlabs/Module/Filestorage.php:147
 msgid "Edit file permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:154
+#: ../../Zotlabs/Module/Filestorage.php:156
 msgid "Set/edit permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:155
+#: ../../Zotlabs/Module/Filestorage.php:157
 msgid "Include all files and sub folders"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:156
+#: ../../Zotlabs/Module/Filestorage.php:158
 msgid "Return to file list"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:158
+#: ../../Zotlabs/Module/Filestorage.php:160
 msgid "Copy/paste this code to attach file to a post"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:159
+#: ../../Zotlabs/Module/Filestorage.php:161
 msgid "Copy/paste this URL to link file from a web page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:161
+#: ../../Zotlabs/Module/Filestorage.php:163
 msgid "Share this file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:162
+#: ../../Zotlabs/Module/Filestorage.php:164
 msgid "Show URL to this file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:163
+#: ../../Zotlabs/Module/Filestorage.php:165
 msgid "Notify your contacts about this file"
 msgstr ""
 
@@ -2765,7 +2749,7 @@ msgid "Could not create privacy group."
 msgstr ""
 
 #: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141
-#: ../../include/items.php:5160
+#: ../../include/items.php:3894
 msgid "Privacy group not found."
 msgstr ""
 
@@ -2819,8 +2803,8 @@ msgid "Help:"
 msgstr ""
 
 #: ../../Zotlabs/Module/Help.php:85 ../../Zotlabs/Module/Help.php:90
-#: ../../Zotlabs/Module/Layouts.php:183 ../../include/apps.php:174
-#: ../../include/nav.php:159
+#: ../../Zotlabs/Module/Layouts.php:183 ../../include/nav.php:159
+#: ../../include/apps.php:174
 msgid "Help"
 msgstr ""
 
@@ -2975,7 +2959,7 @@ msgstr ""
 msgid "Warning: Database versions differ by %1$d updates."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:150 ../../include/import.php:80
+#: ../../Zotlabs/Module/Import.php:150 ../../include/import.php:84
 msgid "Cloned channel not found. Import failed."
 msgstr ""
 
@@ -3162,7 +3146,7 @@ msgstr ""
 msgid "You have reached your limit of %1$.0f webpages."
 msgstr ""
 
-#: ../../Zotlabs/Module/Layouts.php:181 ../../include/text.php:2282
+#: ../../Zotlabs/Module/Layouts.php:181 ../../include/text.php:2279
 msgid "Layouts"
 msgstr ""
 
@@ -3214,13 +3198,13 @@ msgid "Previous action reversed."
 msgstr ""
 
 #: ../../Zotlabs/Module/Like.php:371 ../../Zotlabs/Module/Subthread.php:87
-#: ../../Zotlabs/Module/Tagger.php:47 ../../include/text.php:1969
-#: ../../include/conversation.php:120
+#: ../../Zotlabs/Module/Tagger.php:47 ../../include/conversation.php:120
+#: ../../include/text.php:1952
 msgid "photo"
 msgstr ""
 
 #: ../../Zotlabs/Module/Like.php:371 ../../Zotlabs/Module/Subthread.php:87
-#: ../../include/text.php:1975 ../../include/conversation.php:148
+#: ../../include/conversation.php:148 ../../include/text.php:1958
 msgid "status"
 msgstr ""
 
@@ -3457,12 +3441,17 @@ msgstr ""
 msgid "Subject:"
 msgstr ""
 
+#: ../../Zotlabs/Module/Mail.php:252 ../../Zotlabs/Module/Mail.php:382
+#: ../../include/conversation.php:1226
+msgid "Attach file"
+msgstr ""
+
 #: ../../Zotlabs/Module/Mail.php:254
 msgid "Send"
 msgstr ""
 
 #: ../../Zotlabs/Module/Mail.php:257 ../../Zotlabs/Module/Mail.php:387
-#: ../../include/conversation.php:1261
+#: ../../include/conversation.php:1257
 msgid "Set expiration date"
 msgstr ""
 
@@ -3501,48 +3490,48 @@ msgstr ""
 msgid "Your message for %s (%s):"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:134
+#: ../../Zotlabs/Module/Manage.php:136
 #: ../../Zotlabs/Module/New_channel.php:121
 #, php-format
 msgid "You have created %1$.0f of %2$.0f allowed channels."
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:141
+#: ../../Zotlabs/Module/Manage.php:143
 msgid "Create a new channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:162 ../../include/apps.php:164
-#: ../../include/nav.php:206
+#: ../../Zotlabs/Module/Manage.php:164 ../../include/nav.php:206
+#: ../../include/apps.php:164
 msgid "Channel Manager"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:163
+#: ../../Zotlabs/Module/Manage.php:165
 msgid "Current Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:165
+#: ../../Zotlabs/Module/Manage.php:167
 msgid "Switch to one of your channels by selecting it."
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:166
+#: ../../Zotlabs/Module/Manage.php:168
 msgid "Default Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:167
+#: ../../Zotlabs/Module/Manage.php:169
 msgid "Make Default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:170
+#: ../../Zotlabs/Module/Manage.php:172
 #, php-format
 msgid "%d new messages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:171
+#: ../../Zotlabs/Module/Manage.php:173
 #, php-format
 msgid "%d new introductions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:173
+#: ../../Zotlabs/Module/Manage.php:175
 msgid "Delegated Channel"
 msgstr ""
 
@@ -3598,7 +3587,7 @@ msgstr ""
 msgid "Submit and proceed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2281
+#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2278
 msgid "Menus"
 msgstr ""
 
@@ -3676,7 +3665,7 @@ msgid "Menu Item Permissions"
 msgstr ""
 
 #: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:227
-#: ../../Zotlabs/Module/Settings.php:1066
+#: ../../Zotlabs/Module/Settings.php:1068
 msgid "(click to open/close)"
 msgstr ""
 
@@ -3790,31 +3779,31 @@ msgstr ""
 msgid "Set your current mood and tell your friends"
 msgstr ""
 
-#: ../../Zotlabs/Module/Network.php:95
+#: ../../Zotlabs/Module/Network.php:96
 msgid "No such group"
 msgstr ""
 
-#: ../../Zotlabs/Module/Network.php:135
+#: ../../Zotlabs/Module/Network.php:136
 msgid "No such channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Network.php:140
+#: ../../Zotlabs/Module/Network.php:141
 msgid "forum"
 msgstr ""
 
-#: ../../Zotlabs/Module/Network.php:152
+#: ../../Zotlabs/Module/Network.php:153
 msgid "Search Results For:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Network.php:216
+#: ../../Zotlabs/Module/Network.php:217
 msgid "Privacy group is empty"
 msgstr ""
 
-#: ../../Zotlabs/Module/Network.php:225
+#: ../../Zotlabs/Module/Network.php:226
 msgid "Privacy group: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Network.php:251
+#: ../../Zotlabs/Module/Network.php:252
 msgid "Invalid connection."
 msgstr ""
 
@@ -3957,11 +3946,11 @@ msgstr ""
 msgid "Layout Help"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:83
+#: ../../Zotlabs/Module/Photos.php:84
 msgid "Page owner information could not be retrieved."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:98 ../../Zotlabs/Module/Photos.php:742
+#: ../../Zotlabs/Module/Photos.php:99 ../../Zotlabs/Module/Photos.php:743
 #: ../../Zotlabs/Module/Profile_photo.php:114
 #: ../../Zotlabs/Module/Profile_photo.php:206
 #: ../../Zotlabs/Module/Profile_photo.php:294
@@ -3969,228 +3958,224 @@ msgstr ""
 msgid "Profile Photos"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:104 ../../Zotlabs/Module/Photos.php:148
+#: ../../Zotlabs/Module/Photos.php:105 ../../Zotlabs/Module/Photos.php:149
 msgid "Album not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:131
+#: ../../Zotlabs/Module/Photos.php:132
 msgid "Delete Album"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:152
+#: ../../Zotlabs/Module/Photos.php:153
 msgid ""
 "Multiple storage folders exist with this album name, but within different "
 "directories. Please remove the desired folder or folders using the Files "
 "manager"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:209 ../../Zotlabs/Module/Photos.php:1052
+#: ../../Zotlabs/Module/Photos.php:210 ../../Zotlabs/Module/Photos.php:1053
 msgid "Delete Photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:532
+#: ../../Zotlabs/Module/Photos.php:533
 msgid "No photos selected"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:581
+#: ../../Zotlabs/Module/Photos.php:582
 msgid "Access to this item is restricted."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:620
+#: ../../Zotlabs/Module/Photos.php:621
 #, php-format
 msgid "%1$.2f MB of %2$.2f MB photo storage used."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:623
+#: ../../Zotlabs/Module/Photos.php:624
 #, php-format
 msgid "%1$.2f MB photo storage used."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:659
+#: ../../Zotlabs/Module/Photos.php:660
 msgid "Upload Photos"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:663
+#: ../../Zotlabs/Module/Photos.php:664
 msgid "Enter an album name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:664
+#: ../../Zotlabs/Module/Photos.php:665
 msgid "or select an existing album (doubleclick)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:665
+#: ../../Zotlabs/Module/Photos.php:666
 msgid "Create a status post for this upload"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:666
+#: ../../Zotlabs/Module/Photos.php:667
 msgid "Caption (optional):"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:667
+#: ../../Zotlabs/Module/Photos.php:668
 msgid "Description (optional):"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:694
+#: ../../Zotlabs/Module/Photos.php:695
 msgid "Album name could not be decoded"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:742 ../../Zotlabs/Module/Photos.php:1283
-#: ../../Zotlabs/Module/Photos.php:1300
+#: ../../Zotlabs/Module/Photos.php:743 ../../Zotlabs/Module/Photos.php:1284
+#: ../../Zotlabs/Module/Photos.php:1301
 msgid "Contact Photos"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:765
+#: ../../Zotlabs/Module/Photos.php:766
 msgid "Show Newest First"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:767
+#: ../../Zotlabs/Module/Photos.php:768
 msgid "Show Oldest First"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:791 ../../Zotlabs/Module/Photos.php:1333
+#: ../../Zotlabs/Module/Photos.php:792 ../../Zotlabs/Module/Photos.php:1334
 #: ../../include/widgets.php:1500
 msgid "View Photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:822 ../../include/widgets.php:1517
+#: ../../Zotlabs/Module/Photos.php:823 ../../include/widgets.php:1517
 msgid "Edit Album"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:869
+#: ../../Zotlabs/Module/Photos.php:870
 msgid "Permission denied. Access to this item may be restricted."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:871
+#: ../../Zotlabs/Module/Photos.php:872
 msgid "Photo not available"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:929
+#: ../../Zotlabs/Module/Photos.php:930
 msgid "Use as profile photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:930
+#: ../../Zotlabs/Module/Photos.php:931
 msgid "Use as cover photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:937
+#: ../../Zotlabs/Module/Photos.php:938
 msgid "Private Photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:952
+#: ../../Zotlabs/Module/Photos.php:953
 msgid "View Full Size"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:997 ../../Zotlabs/Module/Tagrm.php:137
-msgid "Remove"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1031
+#: ../../Zotlabs/Module/Photos.php:1032
 msgid "Edit photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1033
+#: ../../Zotlabs/Module/Photos.php:1034
 msgid "Rotate CW (right)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1034
+#: ../../Zotlabs/Module/Photos.php:1035
 msgid "Rotate CCW (left)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1037
+#: ../../Zotlabs/Module/Photos.php:1038
 msgid "Enter a new album name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1038
+#: ../../Zotlabs/Module/Photos.php:1039
 msgid "or select an existing one (doubleclick)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1041
+#: ../../Zotlabs/Module/Photos.php:1042
 msgid "Caption"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1043
+#: ../../Zotlabs/Module/Photos.php:1044
 msgid "Add a Tag"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1047
+#: ../../Zotlabs/Module/Photos.php:1048
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1050
+#: ../../Zotlabs/Module/Photos.php:1051
 msgid "Flag as adult in album view"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1069 ../../include/ItemObject.php:254
+#: ../../Zotlabs/Module/Photos.php:1070 ../../include/ItemObject.php:254
 msgid "I like this (toggle)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1070 ../../include/ItemObject.php:255
+#: ../../Zotlabs/Module/Photos.php:1071 ../../include/ItemObject.php:255
 msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1072 ../../include/ItemObject.php:389
+#: ../../Zotlabs/Module/Photos.php:1073 ../../include/ItemObject.php:389
 #: ../../include/conversation.php:740
 msgid "Please wait"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1088 ../../Zotlabs/Module/Photos.php:1206
+#: ../../Zotlabs/Module/Photos.php:1089 ../../Zotlabs/Module/Photos.php:1207
 #: ../../include/ItemObject.php:700
 msgid "This is you"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1090 ../../Zotlabs/Module/Photos.php:1208
+#: ../../Zotlabs/Module/Photos.php:1091 ../../Zotlabs/Module/Photos.php:1209
 #: ../../include/ItemObject.php:702 ../../include/js_strings.php:6
 msgid "Comment"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1106 ../../include/conversation.php:574
+#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:574
 msgctxt "title"
 msgid "Likes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1106 ../../include/conversation.php:574
+#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:574
 msgctxt "title"
 msgid "Dislikes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:575
+#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:575
 msgctxt "title"
 msgid "Agree"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:575
+#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:575
 msgctxt "title"
 msgid "Disagree"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:575
+#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:575
 msgctxt "title"
 msgid "Abstain"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:576
+#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:576
 msgctxt "title"
 msgid "Attending"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:576
+#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:576
 msgctxt "title"
 msgid "Not attending"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:576
+#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:576
 msgctxt "title"
 msgid "Might attend"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1125 ../../Zotlabs/Module/Photos.php:1137
+#: ../../Zotlabs/Module/Photos.php:1126 ../../Zotlabs/Module/Photos.php:1138
 #: ../../include/ItemObject.php:175 ../../include/ItemObject.php:187
-#: ../../include/conversation.php:1728
+#: ../../include/conversation.php:1724
 msgid "View all"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1129 ../../include/identity.php:1304
-#: ../../include/ItemObject.php:179 ../../include/conversation.php:1752
+#: ../../Zotlabs/Module/Photos.php:1130 ../../include/identity.php:1304
+#: ../../include/ItemObject.php:179 ../../include/conversation.php:1748
 #: ../../include/taxonomy.php:403
 msgctxt "noun"
 msgid "Like"
@@ -4198,47 +4183,47 @@ msgid_plural "Likes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../Zotlabs/Module/Photos.php:1134 ../../include/ItemObject.php:184
-#: ../../include/conversation.php:1755
+#: ../../Zotlabs/Module/Photos.php:1135 ../../include/ItemObject.php:184
+#: ../../include/conversation.php:1751
 msgctxt "noun"
 msgid "Dislike"
 msgid_plural "Dislikes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../Zotlabs/Module/Photos.php:1234
+#: ../../Zotlabs/Module/Photos.php:1235
 msgid "Photo Tools"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1243
+#: ../../Zotlabs/Module/Photos.php:1244
 msgid "In This Photo:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1248
+#: ../../Zotlabs/Module/Photos.php:1249
 msgid "Map"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1256 ../../include/ItemObject.php:378
+#: ../../Zotlabs/Module/Photos.php:1257 ../../include/ItemObject.php:378
 msgctxt "noun"
 msgid "Likes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1257 ../../include/ItemObject.php:379
+#: ../../Zotlabs/Module/Photos.php:1258 ../../include/ItemObject.php:379
 msgctxt "noun"
 msgid "Dislikes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1262 ../../include/acl_selectors.php:268
+#: ../../Zotlabs/Module/Photos.php:1263 ../../include/acl_selectors.php:287
 #: ../../include/ItemObject.php:384
 msgid "Close"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1339
+#: ../../Zotlabs/Module/Photos.php:1340
 msgid "View Album"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1350 ../../Zotlabs/Module/Photos.php:1363
-#: ../../Zotlabs/Module/Photos.php:1364
+#: ../../Zotlabs/Module/Photos.php:1351 ../../Zotlabs/Module/Photos.php:1364
+#: ../../Zotlabs/Module/Photos.php:1365
 msgid "Recent Photos"
 msgstr ""
 
@@ -4264,8 +4249,8 @@ msgstr ""
 msgid "posted an event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Poke.php:168 ../../include/apps.php:177
-#: ../../include/conversation.php:965
+#: ../../Zotlabs/Module/Poke.php:168 ../../include/conversation.php:965
+#: ../../include/apps.php:177
 msgid "Poke"
 msgstr ""
 
@@ -4427,7 +4412,7 @@ msgid "Add profile things"
 msgstr ""
 
 #: ../../Zotlabs/Module/Profiles.php:701 ../../include/widgets.php:105
-#: ../../include/conversation.php:1536
+#: ../../include/conversation.php:1532
 msgid "Personal"
 msgstr ""
 
@@ -4822,7 +4807,7 @@ msgid ""
 msgstr ""
 
 #: ../../Zotlabs/Module/Removeaccount.php:65
-#: ../../Zotlabs/Module/Settings.php:703
+#: ../../Zotlabs/Module/Settings.php:705
 msgid "Remove Account"
 msgstr ""
 
@@ -4850,7 +4835,7 @@ msgid ""
 "removed from the network"
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeme.php:65 ../../Zotlabs/Module/Settings.php:1122
+#: ../../Zotlabs/Module/Removeme.php:65 ../../Zotlabs/Module/Settings.php:1124
 msgid "Remove Channel"
 msgstr ""
 
@@ -4894,597 +4879,596 @@ msgstr ""
 msgid "No service class restrictions found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:67
+#: ../../Zotlabs/Module/Settings.php:69
 msgid "Name is required"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:71
+#: ../../Zotlabs/Module/Settings.php:73
 msgid "Key and Secret are required"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:75 ../../Zotlabs/Module/Settings.php:614
-#: ../../include/apps.php:284
-msgid "Update"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings.php:223
+#: ../../Zotlabs/Module/Settings.php:225
 msgid "Not valid email."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:226
+#: ../../Zotlabs/Module/Settings.php:228
 msgid "Protected email address. Cannot change to that email."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:235
+#: ../../Zotlabs/Module/Settings.php:237
 msgid "System failure storing new email. Please try again."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:252
+#: ../../Zotlabs/Module/Settings.php:254
 msgid "Password verification failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:259
+#: ../../Zotlabs/Module/Settings.php:261
 msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:263
+#: ../../Zotlabs/Module/Settings.php:265
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:277
+#: ../../Zotlabs/Module/Settings.php:279
 msgid "Password changed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:279
+#: ../../Zotlabs/Module/Settings.php:281
 msgid "Password update failed. Please try again."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:523
+#: ../../Zotlabs/Module/Settings.php:525
 msgid "Settings updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:587 ../../Zotlabs/Module/Settings.php:613
-#: ../../Zotlabs/Module/Settings.php:649
+#: ../../Zotlabs/Module/Settings.php:589 ../../Zotlabs/Module/Settings.php:615
+#: ../../Zotlabs/Module/Settings.php:651
 msgid "Add application"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:590
+#: ../../Zotlabs/Module/Settings.php:592
 msgid "Name of application"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:591 ../../Zotlabs/Module/Settings.php:617
+#: ../../Zotlabs/Module/Settings.php:593 ../../Zotlabs/Module/Settings.php:619
 msgid "Consumer Key"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:591 ../../Zotlabs/Module/Settings.php:592
+#: ../../Zotlabs/Module/Settings.php:593 ../../Zotlabs/Module/Settings.php:594
 msgid "Automatically generated - change if desired. Max length 20"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:592 ../../Zotlabs/Module/Settings.php:618
+#: ../../Zotlabs/Module/Settings.php:594 ../../Zotlabs/Module/Settings.php:620
 msgid "Consumer Secret"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:593 ../../Zotlabs/Module/Settings.php:619
+#: ../../Zotlabs/Module/Settings.php:595 ../../Zotlabs/Module/Settings.php:621
 msgid "Redirect"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:593
+#: ../../Zotlabs/Module/Settings.php:595
 msgid ""
 "Redirect URI - leave blank unless your application specifically requires this"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:594 ../../Zotlabs/Module/Settings.php:620
+#: ../../Zotlabs/Module/Settings.php:596 ../../Zotlabs/Module/Settings.php:622
 msgid "Icon url"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:594 ../../Zotlabs/Module/Sources.php:112
+#: ../../Zotlabs/Module/Settings.php:596 ../../Zotlabs/Module/Sources.php:112
 #: ../../Zotlabs/Module/Sources.php:147
 msgid "Optional"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:605
+#: ../../Zotlabs/Module/Settings.php:607
 msgid "Application not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:648
+#: ../../Zotlabs/Module/Settings.php:650
 msgid "Connected Apps"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:652
+#: ../../Zotlabs/Module/Settings.php:654
 msgid "Client key starts with"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:653
+#: ../../Zotlabs/Module/Settings.php:655
 msgid "No name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:654
+#: ../../Zotlabs/Module/Settings.php:656
 msgid "Remove authorization"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:667
+#: ../../Zotlabs/Module/Settings.php:669
 msgid "No feature settings configured"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:674
+#: ../../Zotlabs/Module/Settings.php:676
 msgid "Feature/Addon Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:697
+#: ../../Zotlabs/Module/Settings.php:699
 msgid "Account Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:698
+#: ../../Zotlabs/Module/Settings.php:700
 msgid "Current Password"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:699
+#: ../../Zotlabs/Module/Settings.php:701
 msgid "Enter New Password"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:700
+#: ../../Zotlabs/Module/Settings.php:702
 msgid "Confirm New Password"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:700
+#: ../../Zotlabs/Module/Settings.php:702
 msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:702
-#: ../../Zotlabs/Module/Settings.php:1039
+#: ../../Zotlabs/Module/Settings.php:704
+#: ../../Zotlabs/Module/Settings.php:1041
 msgid "Email Address:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:704
+#: ../../Zotlabs/Module/Settings.php:706
 msgid "Remove this account including all its channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:727
+#: ../../Zotlabs/Module/Settings.php:729
 msgid "Additional Features"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:751
+#: ../../Zotlabs/Module/Settings.php:753
 msgid "Connector Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:790
+#: ../../Zotlabs/Module/Settings.php:792
 msgid "No special theme for mobile devices"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:793
+#: ../../Zotlabs/Module/Settings.php:795
 #, php-format
 msgid "%s - (Experimental)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:835
+#: ../../Zotlabs/Module/Settings.php:837
 msgid "Display Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:836
+#: ../../Zotlabs/Module/Settings.php:838
 msgid "Theme Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:837
+#: ../../Zotlabs/Module/Settings.php:839
 msgid "Custom Theme Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:838
+#: ../../Zotlabs/Module/Settings.php:840
 msgid "Content Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:844
+#: ../../Zotlabs/Module/Settings.php:846
 msgid "Display Theme:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:845
+#: ../../Zotlabs/Module/Settings.php:847
 msgid "Mobile Theme:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:846
+#: ../../Zotlabs/Module/Settings.php:848
 msgid "Preload images before rendering the page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:846
+#: ../../Zotlabs/Module/Settings.php:848
 msgid ""
 "The subjective page load time will be longer but the page will be ready when "
 "displayed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:847
+#: ../../Zotlabs/Module/Settings.php:849
 msgid "Enable user zoom on mobile devices"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:848
+#: ../../Zotlabs/Module/Settings.php:850
 msgid "Update browser every xx seconds"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:848
+#: ../../Zotlabs/Module/Settings.php:850
 msgid "Minimum of 10 seconds, no maximum"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:849
+#: ../../Zotlabs/Module/Settings.php:851
 msgid "Maximum number of conversations to load at any time:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:849
+#: ../../Zotlabs/Module/Settings.php:851
 msgid "Maximum of 100 items"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:850
+#: ../../Zotlabs/Module/Settings.php:852
 msgid "Show emoticons (smilies) as images"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:851
+#: ../../Zotlabs/Module/Settings.php:853
 msgid "Link post titles to source"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:852
+#: ../../Zotlabs/Module/Settings.php:854
 msgid "System Page Layout Editor - (advanced)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:855
+#: ../../Zotlabs/Module/Settings.php:857
 msgid "Use blog/list mode on channel page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:855 ../../Zotlabs/Module/Settings.php:856
+#: ../../Zotlabs/Module/Settings.php:857 ../../Zotlabs/Module/Settings.php:858
 msgid "(comments displayed separately)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:856
+#: ../../Zotlabs/Module/Settings.php:858
 msgid "Use blog/list mode on grid page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:857
+#: ../../Zotlabs/Module/Settings.php:859
 msgid "Channel page max height of content (in pixels)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:857 ../../Zotlabs/Module/Settings.php:858
+#: ../../Zotlabs/Module/Settings.php:859 ../../Zotlabs/Module/Settings.php:860
 msgid "click to expand content exceeding this height"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:858
+#: ../../Zotlabs/Module/Settings.php:860
 msgid "Grid page max height of content (in pixels)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:892
+#: ../../Zotlabs/Module/Settings.php:894
 msgid "Nobody except yourself"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:893
+#: ../../Zotlabs/Module/Settings.php:895
 msgid "Only those you specifically allow"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:894
+#: ../../Zotlabs/Module/Settings.php:896
 msgid "Approved connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:895
+#: ../../Zotlabs/Module/Settings.php:897
 msgid "Any connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:896
+#: ../../Zotlabs/Module/Settings.php:898
 msgid "Anybody on this website"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:897
+#: ../../Zotlabs/Module/Settings.php:899
 msgid "Anybody in this network"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:898
+#: ../../Zotlabs/Module/Settings.php:900
 msgid "Anybody authenticated"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:899
+#: ../../Zotlabs/Module/Settings.php:901
 msgid "Anybody on the internet"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:974
+#: ../../Zotlabs/Module/Settings.php:976
 msgid "Publish your default profile in the network directory"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:979
+#: ../../Zotlabs/Module/Settings.php:981
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:988
+#: ../../Zotlabs/Module/Settings.php:990
 msgid "Your channel address is"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1030
+#: ../../Zotlabs/Module/Settings.php:1032
 msgid "Channel Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1037
+#: ../../Zotlabs/Module/Settings.php:1039
 msgid "Basic Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1038 ../../include/identity.php:1286
+#: ../../Zotlabs/Module/Settings.php:1040 ../../include/identity.php:1286
 msgid "Full Name:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1040
+#: ../../Zotlabs/Module/Settings.php:1042
 msgid "Your Timezone:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1041
+#: ../../Zotlabs/Module/Settings.php:1043
 msgid "Default Post Location:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1041
+#: ../../Zotlabs/Module/Settings.php:1043
 msgid "Geographical location to display on your posts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1042
+#: ../../Zotlabs/Module/Settings.php:1044
 msgid "Use Browser Location:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1044
+#: ../../Zotlabs/Module/Settings.php:1046
 msgid "Adult Content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1044
+#: ../../Zotlabs/Module/Settings.php:1046
 msgid ""
 "This channel frequently or regularly publishes adult content. (Please tag "
 "any adult material and/or nudity with #NSFW)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1046
+#: ../../Zotlabs/Module/Settings.php:1048
 msgid "Security and Privacy Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1049
+#: ../../Zotlabs/Module/Settings.php:1051
 msgid "Your permissions are already configured. Click to view/adjust"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1051
+#: ../../Zotlabs/Module/Settings.php:1053
 msgid "Hide my online presence"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1051
+#: ../../Zotlabs/Module/Settings.php:1053
 msgid "Prevents displaying in your profile that you are online"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1053
+#: ../../Zotlabs/Module/Settings.php:1055
 msgid "Simple Privacy Settings:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1054
+#: ../../Zotlabs/Module/Settings.php:1056
 msgid ""
 "Very Public - <em>extremely permissive (should be used with caution)</em>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1055
+#: ../../Zotlabs/Module/Settings.php:1057
 msgid ""
 "Typical - <em>default public, privacy when desired (similar to social "
 "network permissions but with improved privacy)</em>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1056
+#: ../../Zotlabs/Module/Settings.php:1058
 msgid "Private - <em>default private, never open or public</em>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1057
+#: ../../Zotlabs/Module/Settings.php:1059
 msgid "Blocked - <em>default blocked to/from everybody</em>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1059
+#: ../../Zotlabs/Module/Settings.php:1061
 msgid "Allow others to tag your posts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1059
+#: ../../Zotlabs/Module/Settings.php:1061
 msgid ""
 "Often used by the community to retro-actively flag inappropriate content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1061
+#: ../../Zotlabs/Module/Settings.php:1063
 msgid "Advanced Privacy Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1063
+#: ../../Zotlabs/Module/Settings.php:1065
 msgid "Expire other channel content after this many days"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1063
+#: ../../Zotlabs/Module/Settings.php:1065
 #, php-format
 msgid "0 or blank to use the website limit. The website expires after %d days."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1064
+#: ../../Zotlabs/Module/Settings.php:1066
 msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1064
+#: ../../Zotlabs/Module/Settings.php:1066
 msgid "May reduce spam activity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Zotlabs/Module/Settings.php:1067
 msgid "Default Post Permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1070
+#: ../../Zotlabs/Module/Settings.php:1069
+msgid "Use my default audience setting for the type of post"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:1072
 msgid "Channel permissions category:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1076
+#: ../../Zotlabs/Module/Settings.php:1078
 msgid "Maximum private messages per day from unknown people:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1076
+#: ../../Zotlabs/Module/Settings.php:1078
 msgid "Useful to reduce spamming"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1079
+#: ../../Zotlabs/Module/Settings.php:1081
 msgid "Notification Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1080
+#: ../../Zotlabs/Module/Settings.php:1082
 msgid "By default post a status message when:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1081
+#: ../../Zotlabs/Module/Settings.php:1083
 msgid "accepting a friend request"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1082
+#: ../../Zotlabs/Module/Settings.php:1084
 msgid "joining a forum/community"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1083
+#: ../../Zotlabs/Module/Settings.php:1085
 msgid "making an <em>interesting</em> profile change"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1084
+#: ../../Zotlabs/Module/Settings.php:1086
 msgid "Send a notification email when:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1085
+#: ../../Zotlabs/Module/Settings.php:1087
 msgid "You receive a connection request"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1086
+#: ../../Zotlabs/Module/Settings.php:1088
 msgid "Your connections are confirmed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1087
+#: ../../Zotlabs/Module/Settings.php:1089
 msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1088
+#: ../../Zotlabs/Module/Settings.php:1090
 msgid "Someone writes a followup comment"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1089
+#: ../../Zotlabs/Module/Settings.php:1091
 msgid "You receive a private message"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1090
+#: ../../Zotlabs/Module/Settings.php:1092
 msgid "You receive a friend suggestion"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1091
+#: ../../Zotlabs/Module/Settings.php:1093
 msgid "You are tagged in a post"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1092
+#: ../../Zotlabs/Module/Settings.php:1094
 msgid "You are poked/prodded/etc. in a post"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1095
+#: ../../Zotlabs/Module/Settings.php:1097
 msgid "Show visual notifications including:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1097
+#: ../../Zotlabs/Module/Settings.php:1099
 msgid "Unseen grid activity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1098
+#: ../../Zotlabs/Module/Settings.php:1100
 msgid "Unseen channel activity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1099
+#: ../../Zotlabs/Module/Settings.php:1101
 msgid "Unseen private messages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1099
-#: ../../Zotlabs/Module/Settings.php:1104
-#: ../../Zotlabs/Module/Settings.php:1105
+#: ../../Zotlabs/Module/Settings.php:1101
 #: ../../Zotlabs/Module/Settings.php:1106
+#: ../../Zotlabs/Module/Settings.php:1107
+#: ../../Zotlabs/Module/Settings.php:1108
 msgid "Recommended"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1100
+#: ../../Zotlabs/Module/Settings.php:1102
 msgid "Upcoming events"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1101
+#: ../../Zotlabs/Module/Settings.php:1103
 msgid "Events today"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1102
+#: ../../Zotlabs/Module/Settings.php:1104
 msgid "Upcoming birthdays"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1102
+#: ../../Zotlabs/Module/Settings.php:1104
 msgid "Not available in all themes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1103
+#: ../../Zotlabs/Module/Settings.php:1105
 msgid "System (personal) notifications"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1104
+#: ../../Zotlabs/Module/Settings.php:1106
 msgid "System info messages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1105
+#: ../../Zotlabs/Module/Settings.php:1107
 msgid "System critical alerts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1106
+#: ../../Zotlabs/Module/Settings.php:1108
 msgid "New connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1107
+#: ../../Zotlabs/Module/Settings.php:1109
 msgid "System Registrations"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1108
+#: ../../Zotlabs/Module/Settings.php:1110
 msgid ""
 "Also show new wall posts, private messages and connections under Notices"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1110
+#: ../../Zotlabs/Module/Settings.php:1112
 msgid "Notify me of events this many days in advance"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1110
+#: ../../Zotlabs/Module/Settings.php:1112
 msgid "Must be greater than 0"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1112
+#: ../../Zotlabs/Module/Settings.php:1114
 msgid "Advanced Account/Page Type Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1113
+#: ../../Zotlabs/Module/Settings.php:1115
 msgid "Change the behaviour of this account for special situations"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1116
+#: ../../Zotlabs/Module/Settings.php:1118
 msgid ""
 "Please enable expert mode (in <a href=\"settings/features\">Settings > "
 "Additional features</a>) to adjust!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1117
+#: ../../Zotlabs/Module/Settings.php:1119
 msgid "Miscellaneous Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1118
+#: ../../Zotlabs/Module/Settings.php:1120
 msgid "Default photo upload folder"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1118
-#: ../../Zotlabs/Module/Settings.php:1119
+#: ../../Zotlabs/Module/Settings.php:1120
+#: ../../Zotlabs/Module/Settings.php:1121
 msgid "%Y - current year, %m -  current month"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1119
+#: ../../Zotlabs/Module/Settings.php:1121
 msgid "Default file upload folder"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1121
+#: ../../Zotlabs/Module/Settings.php:1123
 msgid "Personal menu to display in your channel pages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1123
+#: ../../Zotlabs/Module/Settings.php:1125
 msgid "Remove this channel."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1124
+#: ../../Zotlabs/Module/Settings.php:1126
 msgid "Firefox Share $Projectname provider"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1125
+#: ../../Zotlabs/Module/Settings.php:1127
 msgid "Start calendar week on monday"
 msgstr ""
 
@@ -6084,8 +6068,8 @@ msgstr ""
 msgid "post"
 msgstr ""
 
-#: ../../Zotlabs/Module/Tagger.php:57 ../../include/text.php:1977
-#: ../../include/conversation.php:150
+#: ../../Zotlabs/Module/Tagger.php:57 ../../include/conversation.php:150
+#: ../../include/text.php:1960
 msgid "comment"
 msgstr ""
 
@@ -6238,20 +6222,20 @@ msgstr ""
 msgid "Source of Item"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:186 ../../include/apps.php:168
-#: ../../include/conversation.php:1696 ../../include/nav.php:106
+#: ../../Zotlabs/Module/Webpages.php:184 ../../include/nav.php:106
+#: ../../include/conversation.php:1692 ../../include/apps.php:168
 msgid "Webpages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:197 ../../include/page_widgets.php:41
+#: ../../Zotlabs/Module/Webpages.php:195 ../../include/page_widgets.php:41
 msgid "Actions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:198 ../../include/page_widgets.php:42
+#: ../../Zotlabs/Module/Webpages.php:196 ../../include/page_widgets.php:42
 msgid "Page Link"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:199
+#: ../../Zotlabs/Module/Webpages.php:197
 msgid "Page Title"
 msgstr ""
 
@@ -6267,11 +6251,11 @@ msgstr ""
 msgid "No username found in import file."
 msgstr ""
 
-#: ../../include/Import/import_diaspora.php:42 ../../include/import.php:44
+#: ../../include/Import/import_diaspora.php:42 ../../include/import.php:48
 msgid "Unable to create a unique channel address. Import failed."
 msgstr ""
 
-#: ../../include/dba/dba_driver.php:141
+#: ../../include/dba/dba_driver.php:142
 #, php-format
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr ""
@@ -6467,33 +6451,42 @@ msgstr ""
 msgid "commented on %s's post"
 msgstr ""
 
-#: ../../include/acl_selectors.php:230
+#: ../../include/oembed.php:324
+msgid "Embedded content"
+msgstr ""
+
+#: ../../include/oembed.php:333
+msgid "Embedding disabled"
+msgstr ""
+
+#: ../../include/acl_selectors.php:236
+#: ../../include/PermissionDescription.php:31
 msgid "Visible to your default audience"
 msgstr ""
 
-#: ../../include/acl_selectors.php:255
+#: ../../include/acl_selectors.php:274
 msgid "Limit access:"
 msgstr ""
 
-#: ../../include/acl_selectors.php:256
+#: ../../include/acl_selectors.php:275
 msgid ""
 "Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit "
 "the scope of \"Show\"."
 msgstr ""
 
-#: ../../include/acl_selectors.php:257
+#: ../../include/acl_selectors.php:276
 msgid "Show"
 msgstr ""
 
-#: ../../include/acl_selectors.php:258
+#: ../../include/acl_selectors.php:277
 msgid "Don't show"
 msgstr ""
 
-#: ../../include/acl_selectors.php:264
+#: ../../include/acl_selectors.php:283
 msgid "Other networks and post services"
 msgstr ""
 
-#: ../../include/acl_selectors.php:294
+#: ../../include/acl_selectors.php:313
 #, php-format
 msgid ""
 "Post permissions %s cannot be changed %s after a post is shared.</br />These "
@@ -6756,93 +6749,105 @@ msgstr ""
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr ""
 
-#: ../../include/apps.php:155
-msgid "Site Admin"
+#: ../../include/contact_widgets.php:14
+#, php-format
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/contact_widgets.php:22
+msgid "Find Channels"
 msgstr ""
 
-#: ../../include/apps.php:156
-msgid "Bug Report"
+#: ../../include/contact_widgets.php:23
+msgid "Enter name or interest"
 msgstr ""
 
-#: ../../include/apps.php:157
-msgid "View Bookmarks"
+#: ../../include/contact_widgets.php:24
+msgid "Connect/Follow"
 msgstr ""
 
-#: ../../include/apps.php:158
-msgid "My Chatrooms"
+#: ../../include/contact_widgets.php:25
+msgid "Examples: Robert Morgenstein, Fishing"
 msgstr ""
 
-#: ../../include/apps.php:160
-msgid "Firefox Share"
+#: ../../include/contact_widgets.php:29
+msgid "Random Profile"
 msgstr ""
 
-#: ../../include/apps.php:161
-msgid "Remote Diagnostics"
+#: ../../include/contact_widgets.php:30
+msgid "Invite Friends"
 msgstr ""
 
-#: ../../include/apps.php:162 ../../include/features.php:89
-msgid "Suggest Channels"
+#: ../../include/contact_widgets.php:32
+msgid "Advanced example: name=fred and country=iceland"
 msgstr ""
 
-#: ../../include/apps.php:163 ../../include/nav.php:110 ../../boot.php:1615
-msgid "Login"
+#: ../../include/contact_widgets.php:57 ../../include/widgets.php:310
+#: ../../include/features.php:97
+msgid "Saved Folders"
 msgstr ""
 
-#: ../../include/apps.php:165 ../../include/nav.php:179
-msgid "Grid"
+#: ../../include/contact_widgets.php:60 ../../include/contact_widgets.php:100
+#: ../../include/widgets.php:313 ../../include/widgets.php:432
+msgid "Everything"
 msgstr ""
 
-#: ../../include/apps.php:169 ../../include/nav.php:182
-msgid "Channel Home"
+#: ../../include/contact_widgets.php:97 ../../include/widgets.php:46
+#: ../../include/widgets.php:429 ../../include/taxonomy.php:188
+#: ../../include/taxonomy.php:270
+msgid "Categories"
 msgstr ""
 
-#: ../../include/apps.php:172 ../../include/conversation.php:1659
-#: ../../include/conversation.php:1662 ../../include/nav.php:201
-msgid "Events"
+#: ../../include/contact_widgets.php:130
+#, php-format
+msgid "%d connection in common"
+msgid_plural "%d connections in common"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/contact_widgets.php:135
+msgid "show more"
 msgstr ""
 
-#: ../../include/apps.php:173 ../../include/nav.php:167
-msgid "Directory"
+#: ../../include/event.php:22 ../../include/text.php:1466
+#: ../../include/bb2diaspora.php:487
+msgid "l F d, Y \\@ g:i A"
 msgstr ""
 
-#: ../../include/apps.php:175 ../../include/nav.php:193
-msgid "Mail"
+#: ../../include/event.php:30 ../../include/text.php:1470
+#: ../../include/bb2diaspora.php:493
+msgid "Starts:"
 msgstr ""
 
-#: ../../include/apps.php:178 ../../include/nav.php:96
-msgid "Chat"
+#: ../../include/event.php:40 ../../include/text.php:1474
+#: ../../include/bb2diaspora.php:501
+msgid "Finishes:"
 msgstr ""
 
-#: ../../include/apps.php:180
-msgid "Probe"
+#: ../../include/event.php:769
+msgid "This event has been added to your calendar."
 msgstr ""
 
-#: ../../include/apps.php:181
-msgid "Suggest"
+#: ../../include/event.php:968
+msgid "Not specified"
 msgstr ""
 
-#: ../../include/apps.php:182
-msgid "Random Channel"
+#: ../../include/event.php:969
+msgid "Needs Action"
 msgstr ""
 
-#: ../../include/apps.php:183
-msgid "Invite"
+#: ../../include/event.php:970
+msgid "Completed"
 msgstr ""
 
-#: ../../include/apps.php:184 ../../include/widgets.php:1387
-msgid "Features"
+#: ../../include/event.php:971
+msgid "In Process"
 msgstr ""
 
-#: ../../include/apps.php:186
-msgid "Post"
-msgstr ""
-
-#: ../../include/apps.php:284
-msgid "Install"
-msgstr ""
-
-#: ../../include/apps.php:289
-msgid "Purchase"
+#: ../../include/event.php:972
+msgid "Cancelled"
 msgstr ""
 
 #: ../../include/photos.php:112
@@ -6868,7 +6873,7 @@ msgctxt "photo_upload"
 msgid "%1$s posted %2$s to %3$s"
 msgstr ""
 
-#: ../../include/photos.php:506 ../../include/conversation.php:1645
+#: ../../include/photos.php:506 ../../include/conversation.php:1641
 msgid "Photo Albums"
 msgstr ""
 
@@ -6876,57 +6881,30 @@ msgstr ""
 msgid "Upload New Photos"
 msgstr ""
 
-#: ../../include/bb2diaspora.php:398
-msgid "Attachments:"
+#: ../../include/import.php:27
+msgid ""
+"Cannot create a duplicate channel identifier on this system. Import failed."
 msgstr ""
 
-#: ../../include/bb2diaspora.php:487 ../../include/event.php:22
-#: ../../include/text.php:1466
-msgid "l F d, Y \\@ g:i A"
+#: ../../include/import.php:74
+msgid "Channel clone failed. Import failed."
 msgstr ""
 
-#: ../../include/bb2diaspora.php:489
-msgid "$Projectname event notification:"
+#: ../../include/zot.php:680
+msgid "Invalid data packet"
 msgstr ""
 
-#: ../../include/bb2diaspora.php:493 ../../include/event.php:30
-#: ../../include/text.php:1470
-msgid "Starts:"
+#: ../../include/zot.php:696
+msgid "Unable to verify channel signature"
 msgstr ""
 
-#: ../../include/bb2diaspora.php:501 ../../include/event.php:40
-#: ../../include/text.php:1474
-msgid "Finishes:"
+#: ../../include/zot.php:2342
+#, php-format
+msgid "Unable to verify site signature for %s"
 msgstr ""
 
-#: ../../include/event.php:779
-msgid "This event has been added to your calendar."
-msgstr ""
-
-#: ../../include/event.php:978
-msgid "Not specified"
-msgstr ""
-
-#: ../../include/event.php:979
-msgid "Needs Action"
-msgstr ""
-
-#: ../../include/event.php:980
-msgid "Completed"
-msgstr ""
-
-#: ../../include/event.php:981
-msgid "In Process"
-msgstr ""
-
-#: ../../include/event.php:982
-msgid "Cancelled"
-msgstr ""
-
-#: ../../include/widgets.php:46 ../../include/widgets.php:429
-#: ../../include/contact_widgets.php:97 ../../include/taxonomy.php:188
-#: ../../include/taxonomy.php:270
-msgid "Categories"
+#: ../../include/zot.php:3680
+msgid "invalid target signature"
 msgstr ""
 
 #: ../../include/widgets.php:103
@@ -6978,16 +6956,6 @@ msgstr ""
 msgid "add"
 msgstr ""
 
-#: ../../include/widgets.php:310 ../../include/contact_widgets.php:57
-#: ../../include/features.php:97
-msgid "Saved Folders"
-msgstr ""
-
-#: ../../include/widgets.php:313 ../../include/widgets.php:432
-#: ../../include/contact_widgets.php:60 ../../include/contact_widgets.php:100
-msgid "Everything"
-msgstr ""
-
 #: ../../include/widgets.php:354
 msgid "Archives"
 msgstr ""
@@ -7100,8 +7068,8 @@ msgstr ""
 msgid "Import Calendar"
 msgstr ""
 
-#: ../../include/widgets.php:843 ../../include/conversation.php:1673
-#: ../../include/conversation.php:1676
+#: ../../include/widgets.php:843 ../../include/conversation.php:1669
+#: ../../include/conversation.php:1672
 msgid "Chatrooms"
 msgstr ""
 
@@ -7177,6 +7145,10 @@ msgstr ""
 msgid "Member registrations waiting for confirmation"
 msgstr ""
 
+#: ../../include/widgets.php:1387 ../../include/apps.php:184
+msgid "Features"
+msgstr ""
+
 #: ../../include/widgets.php:1390
 msgid "Inspect queue"
 msgstr ""
@@ -7245,69 +7217,288 @@ msgid ""
 "form has been opened for too long (>3 hours) before submitting it."
 msgstr ""
 
-#: ../../include/import.php:23
-msgid ""
-"Cannot create a duplicate channel identifier on this system. Import failed."
-msgstr ""
-
-#: ../../include/import.php:70
-msgid "Channel clone failed. Import failed."
-msgstr ""
-
-#: ../../include/items.php:1138 ../../include/items.php:1183
+#: ../../include/items.php:890 ../../include/items.php:935
 msgid "(Unknown)"
 msgstr ""
 
-#: ../../include/items.php:1382
+#: ../../include/items.php:1134
 msgid "Visible to anybody on the internet."
 msgstr ""
 
-#: ../../include/items.php:1384
+#: ../../include/items.php:1136
 msgid "Visible to you only."
 msgstr ""
 
-#: ../../include/items.php:1386
+#: ../../include/items.php:1138
 msgid "Visible to anybody in this network."
 msgstr ""
 
-#: ../../include/items.php:1388
+#: ../../include/items.php:1140
 msgid "Visible to anybody authenticated."
 msgstr ""
 
-#: ../../include/items.php:1390
+#: ../../include/items.php:1142
 #, php-format
 msgid "Visible to anybody on %s."
 msgstr ""
 
-#: ../../include/items.php:1392
+#: ../../include/items.php:1144
 msgid "Visible to all connections."
 msgstr ""
 
-#: ../../include/items.php:1394
+#: ../../include/items.php:1146
 msgid "Visible to approved connections."
 msgstr ""
 
-#: ../../include/items.php:1396
+#: ../../include/items.php:1148
 msgid "Visible to specific connections."
 msgstr ""
 
-#: ../../include/items.php:5176
+#: ../../include/items.php:3910
 msgid "Privacy group is empty."
 msgstr ""
 
-#: ../../include/items.php:5183
+#: ../../include/items.php:3917
 #, php-format
 msgid "Privacy group: %s"
 msgstr ""
 
-#: ../../include/items.php:5195
+#: ../../include/items.php:3929
 msgid "Connection not found."
 msgstr ""
 
-#: ../../include/items.php:5628
+#: ../../include/items.php:4278
 msgid "profile photo"
 msgstr ""
 
+#: ../../include/nav.php:82 ../../include/nav.php:113 ../../boot.php:1614
+msgid "Logout"
+msgstr ""
+
+#: ../../include/nav.php:82 ../../include/nav.php:113
+msgid "End this session"
+msgstr ""
+
+#: ../../include/nav.php:85 ../../include/nav.php:144
+msgid "Home"
+msgstr ""
+
+#: ../../include/nav.php:85
+msgid "Your posts and conversations"
+msgstr ""
+
+#: ../../include/nav.php:86
+msgid "Your profile page"
+msgstr ""
+
+#: ../../include/nav.php:88
+msgid "Manage/Edit profiles"
+msgstr ""
+
+#: ../../include/nav.php:90
+msgid "Edit your profile"
+msgstr ""
+
+#: ../../include/nav.php:92
+msgid "Your photos"
+msgstr ""
+
+#: ../../include/nav.php:93
+msgid "Your files"
+msgstr ""
+
+#: ../../include/nav.php:96 ../../include/apps.php:178
+msgid "Chat"
+msgstr ""
+
+#: ../../include/nav.php:96
+msgid "Your chatrooms"
+msgstr ""
+
+#: ../../include/nav.php:102 ../../include/conversation.php:1682
+msgid "Bookmarks"
+msgstr ""
+
+#: ../../include/nav.php:102
+msgid "Your bookmarks"
+msgstr ""
+
+#: ../../include/nav.php:106
+msgid "Your webpages"
+msgstr ""
+
+#: ../../include/nav.php:110 ../../include/apps.php:163 ../../boot.php:1615
+msgid "Login"
+msgstr ""
+
+#: ../../include/nav.php:110
+msgid "Sign in"
+msgstr ""
+
+#: ../../include/nav.php:127
+#, php-format
+msgid "%s - click to logout"
+msgstr ""
+
+#: ../../include/nav.php:130
+msgid "Remote authentication"
+msgstr ""
+
+#: ../../include/nav.php:130
+msgid "Click to authenticate to your home hub"
+msgstr ""
+
+#: ../../include/nav.php:144
+msgid "Home Page"
+msgstr ""
+
+#: ../../include/nav.php:147
+msgid "Create an account"
+msgstr ""
+
+#: ../../include/nav.php:159
+msgid "Help and documentation"
+msgstr ""
+
+#: ../../include/nav.php:163
+msgid "Applications, utilities, links, games"
+msgstr ""
+
+#: ../../include/nav.php:165
+msgid "Search site @name, #tag, ?docs, content"
+msgstr ""
+
+#: ../../include/nav.php:167 ../../include/apps.php:173
+msgid "Directory"
+msgstr ""
+
+#: ../../include/nav.php:167
+msgid "Channel Directory"
+msgstr ""
+
+#: ../../include/nav.php:179 ../../include/apps.php:165
+msgid "Grid"
+msgstr ""
+
+#: ../../include/nav.php:179
+msgid "Your grid"
+msgstr ""
+
+#: ../../include/nav.php:180
+msgid "Mark all grid notifications seen"
+msgstr ""
+
+#: ../../include/nav.php:182 ../../include/apps.php:169
+msgid "Channel Home"
+msgstr ""
+
+#: ../../include/nav.php:182
+msgid "Channel home"
+msgstr ""
+
+#: ../../include/nav.php:183
+msgid "Mark all channel notifications seen"
+msgstr ""
+
+#: ../../include/nav.php:189
+msgid "Notices"
+msgstr ""
+
+#: ../../include/nav.php:189
+msgid "Notifications"
+msgstr ""
+
+#: ../../include/nav.php:190
+msgid "See all notifications"
+msgstr ""
+
+#: ../../include/nav.php:193 ../../include/apps.php:175
+msgid "Mail"
+msgstr ""
+
+#: ../../include/nav.php:193
+msgid "Private mail"
+msgstr ""
+
+#: ../../include/nav.php:194
+msgid "See all private messages"
+msgstr ""
+
+#: ../../include/nav.php:195
+msgid "Mark all private messages seen"
+msgstr ""
+
+#: ../../include/nav.php:201 ../../include/conversation.php:1655
+#: ../../include/conversation.php:1658 ../../include/apps.php:172
+msgid "Events"
+msgstr ""
+
+#: ../../include/nav.php:201
+msgid "Event Calendar"
+msgstr ""
+
+#: ../../include/nav.php:202
+msgid "See all events"
+msgstr ""
+
+#: ../../include/nav.php:203
+msgid "Mark all events seen"
+msgstr ""
+
+#: ../../include/nav.php:206
+msgid "Manage Your Channels"
+msgstr ""
+
+#: ../../include/nav.php:208
+msgid "Account/Channel Settings"
+msgstr ""
+
+#: ../../include/nav.php:216
+msgid "Site Setup and Configuration"
+msgstr ""
+
+#: ../../include/nav.php:247 ../../include/conversation.php:854
+msgid "Loading..."
+msgstr ""
+
+#: ../../include/nav.php:252
+msgid "@name, #tag, ?doc, content"
+msgstr ""
+
+#: ../../include/nav.php:253
+msgid "Please wait..."
+msgstr ""
+
+#: ../../include/network.php:659
+msgid "view full size"
+msgstr ""
+
+#: ../../include/network.php:1827 ../../include/enotify.php:57
+msgid "$Projectname Notification"
+msgstr ""
+
+#: ../../include/network.php:1828 ../../include/enotify.php:58
+msgid "$projectname"
+msgstr ""
+
+#: ../../include/network.php:1830 ../../include/enotify.php:60
+msgid "Thank You,"
+msgstr ""
+
+#: ../../include/network.php:1832 ../../include/enotify.php:62
+#, php-format
+msgid "%s Administrator"
+msgstr ""
+
+#: ../../include/network.php:1875 ../../include/account.php:317
+#: ../../include/account.php:344 ../../include/account.php:404
+msgid "Administrator"
+msgstr ""
+
+#: ../../include/network.php:1889
+msgid "No Subject"
+msgstr ""
+
 #: ../../include/contact_selectors.php:56
 msgid "Frequently"
 msgstr ""
@@ -7373,52 +7564,6 @@ msgstr ""
 msgid "MySpace"
 msgstr ""
 
-#: ../../include/contact_widgets.php:14
-#, php-format
-msgid "%d invitation available"
-msgid_plural "%d invitations available"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/contact_widgets.php:22
-msgid "Find Channels"
-msgstr ""
-
-#: ../../include/contact_widgets.php:23
-msgid "Enter name or interest"
-msgstr ""
-
-#: ../../include/contact_widgets.php:24
-msgid "Connect/Follow"
-msgstr ""
-
-#: ../../include/contact_widgets.php:25
-msgid "Examples: Robert Morgenstein, Fishing"
-msgstr ""
-
-#: ../../include/contact_widgets.php:29
-msgid "Random Profile"
-msgstr ""
-
-#: ../../include/contact_widgets.php:30
-msgid "Invite Friends"
-msgstr ""
-
-#: ../../include/contact_widgets.php:32
-msgid "Advanced example: name=fred and country=iceland"
-msgstr ""
-
-#: ../../include/contact_widgets.php:130
-#, php-format
-msgid "%d connection in common"
-msgid_plural "%d connections in common"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/contact_widgets.php:135
-msgid "show more"
-msgstr ""
-
 #: ../../include/attach.php:247 ../../include/attach.php:333
 msgid "Item was not found."
 msgstr ""
@@ -7493,7 +7638,7 @@ msgstr ""
 msgid "YYYY-MM-DD or MM-DD"
 msgstr ""
 
-#: ../../include/datetime.php:273 ../../boot.php:2448
+#: ../../include/datetime.php:273 ../../boot.php:2463
 msgid "never"
 msgstr ""
 
@@ -7582,23 +7727,6 @@ msgstr ""
 msgid "This Website Only"
 msgstr ""
 
-#: ../../include/enotify.php:57 ../../include/network.php:1827
-msgid "$Projectname Notification"
-msgstr ""
-
-#: ../../include/enotify.php:58 ../../include/network.php:1828
-msgid "$projectname"
-msgstr ""
-
-#: ../../include/enotify.php:60 ../../include/network.php:1830
-msgid "Thank You,"
-msgstr ""
-
-#: ../../include/enotify.php:62 ../../include/network.php:1832
-#, php-format
-msgid "%s Administrator"
-msgstr ""
-
 #: ../../include/enotify.php:96
 #, php-format
 msgid "%s <!item_type!>"
@@ -7904,7 +8032,7 @@ msgstr ""
 msgid "Expires: %s"
 msgstr ""
 
-#: ../../include/ItemObject.php:362 ../../bookmarker/bookmarker.php:45
+#: ../../include/ItemObject.php:362
 msgid "Save Bookmarks"
 msgstr ""
 
@@ -7920,6 +8048,26 @@ msgstr ""
 msgid "[+] show all"
 msgstr ""
 
+#: ../../include/ItemObject.php:704 ../../include/conversation.php:1221
+msgid "Bold"
+msgstr ""
+
+#: ../../include/ItemObject.php:705 ../../include/conversation.php:1222
+msgid "Italic"
+msgstr ""
+
+#: ../../include/ItemObject.php:706 ../../include/conversation.php:1223
+msgid "Underline"
+msgstr ""
+
+#: ../../include/ItemObject.php:707 ../../include/conversation.php:1224
+msgid "Quote"
+msgstr ""
+
+#: ../../include/ItemObject.php:708 ../../include/conversation.php:1225
+msgid "Code"
+msgstr ""
+
 #: ../../include/ItemObject.php:709
 msgid "Image"
 msgstr ""
@@ -7932,6 +8080,650 @@ msgstr ""
 msgid "Video"
 msgstr ""
 
+#: ../../include/features.php:48
+msgid "General Features"
+msgstr ""
+
+#: ../../include/features.php:50
+msgid "Content Expiration"
+msgstr ""
+
+#: ../../include/features.php:50
+msgid "Remove posts/comments and/or private messages at a future time"
+msgstr ""
+
+#: ../../include/features.php:51
+msgid "Multiple Profiles"
+msgstr ""
+
+#: ../../include/features.php:51
+msgid "Ability to create multiple profiles"
+msgstr ""
+
+#: ../../include/features.php:52
+msgid "Advanced Profiles"
+msgstr ""
+
+#: ../../include/features.php:52
+msgid "Additional profile sections and selections"
+msgstr ""
+
+#: ../../include/features.php:53
+msgid "Profile Import/Export"
+msgstr ""
+
+#: ../../include/features.php:53
+msgid "Save and load profile details across sites/channels"
+msgstr ""
+
+#: ../../include/features.php:54
+msgid "Web Pages"
+msgstr ""
+
+#: ../../include/features.php:54
+msgid "Provide managed web pages on your channel"
+msgstr ""
+
+#: ../../include/features.php:55
+msgid "Hide Rating"
+msgstr ""
+
+#: ../../include/features.php:55
+msgid ""
+"Hide the rating buttons on your channel and profile pages. Note: People can "
+"still rate you somewhere else."
+msgstr ""
+
+#: ../../include/features.php:56
+msgid "Private Notes"
+msgstr ""
+
+#: ../../include/features.php:56
+msgid "Enables a tool to store notes and reminders (note: not encrypted)"
+msgstr ""
+
+#: ../../include/features.php:57
+msgid "Navigation Channel Select"
+msgstr ""
+
+#: ../../include/features.php:57
+msgid "Change channels directly from within the navigation dropdown menu"
+msgstr ""
+
+#: ../../include/features.php:58
+msgid "Photo Location"
+msgstr ""
+
+#: ../../include/features.php:58
+msgid "If location data is available on uploaded photos, link this to a map."
+msgstr ""
+
+#: ../../include/features.php:59
+msgid "Access Controlled Chatrooms"
+msgstr ""
+
+#: ../../include/features.php:59
+msgid "Provide chatrooms and chat services with access control."
+msgstr ""
+
+#: ../../include/features.php:60
+msgid "Smart Birthdays"
+msgstr ""
+
+#: ../../include/features.php:60
+msgid ""
+"Make birthday events timezone aware in case your friends are scattered "
+"across the planet."
+msgstr ""
+
+#: ../../include/features.php:61
+msgid "Expert Mode"
+msgstr ""
+
+#: ../../include/features.php:61
+msgid "Enable Expert Mode to provide advanced configuration options"
+msgstr ""
+
+#: ../../include/features.php:62
+msgid "Premium Channel"
+msgstr ""
+
+#: ../../include/features.php:62
+msgid ""
+"Allows you to set restrictions and terms on those that connect with your "
+"channel"
+msgstr ""
+
+#: ../../include/features.php:67
+msgid "Post Composition Features"
+msgstr ""
+
+#: ../../include/features.php:70
+msgid "Large Photos"
+msgstr ""
+
+#: ../../include/features.php:70
+msgid ""
+"Include large (1024px) photo thumbnails in posts. If not enabled, use small "
+"(640px) photo thumbnails"
+msgstr ""
+
+#: ../../include/features.php:71
+msgid "Automatically import channel content from other channels or feeds"
+msgstr ""
+
+#: ../../include/features.php:72
+msgid "Even More Encryption"
+msgstr ""
+
+#: ../../include/features.php:72
+msgid ""
+"Allow optional encryption of content end-to-end with a shared secret key"
+msgstr ""
+
+#: ../../include/features.php:73
+msgid "Enable Voting Tools"
+msgstr ""
+
+#: ../../include/features.php:73
+msgid "Provide a class of post which others can vote on"
+msgstr ""
+
+#: ../../include/features.php:74
+msgid "Delayed Posting"
+msgstr ""
+
+#: ../../include/features.php:74
+msgid "Allow posts to be published at a later date"
+msgstr ""
+
+#: ../../include/features.php:75
+msgid "Suppress Duplicate Posts/Comments"
+msgstr ""
+
+#: ../../include/features.php:75
+msgid ""
+"Prevent posts with identical content to be published with less than two "
+"minutes in between submissions."
+msgstr ""
+
+#: ../../include/features.php:81
+msgid "Network and Stream Filtering"
+msgstr ""
+
+#: ../../include/features.php:82
+msgid "Search by Date"
+msgstr ""
+
+#: ../../include/features.php:82
+msgid "Ability to select posts by date ranges"
+msgstr ""
+
+#: ../../include/features.php:83 ../../include/group.php:311
+msgid "Privacy Groups"
+msgstr ""
+
+#: ../../include/features.php:83
+msgid "Enable management and selection of privacy groups"
+msgstr ""
+
+#: ../../include/features.php:84
+msgid "Save search terms for re-use"
+msgstr ""
+
+#: ../../include/features.php:85
+msgid "Network Personal Tab"
+msgstr ""
+
+#: ../../include/features.php:85
+msgid "Enable tab to display only Network posts that you've interacted on"
+msgstr ""
+
+#: ../../include/features.php:86
+msgid "Network New Tab"
+msgstr ""
+
+#: ../../include/features.php:86
+msgid "Enable tab to display all new Network activity"
+msgstr ""
+
+#: ../../include/features.php:87
+msgid "Affinity Tool"
+msgstr ""
+
+#: ../../include/features.php:87
+msgid "Filter stream activity by depth of relationships"
+msgstr ""
+
+#: ../../include/features.php:88
+msgid "Connection Filtering"
+msgstr ""
+
+#: ../../include/features.php:88
+msgid "Filter incoming posts from connections based on keywords/content"
+msgstr ""
+
+#: ../../include/features.php:89 ../../include/apps.php:162
+msgid "Suggest Channels"
+msgstr ""
+
+#: ../../include/features.php:89
+msgid "Show channel suggestions"
+msgstr ""
+
+#: ../../include/features.php:94
+msgid "Post/Comment Tools"
+msgstr ""
+
+#: ../../include/features.php:95
+msgid "Community Tagging"
+msgstr ""
+
+#: ../../include/features.php:95
+msgid "Ability to tag existing posts"
+msgstr ""
+
+#: ../../include/features.php:96
+msgid "Post Categories"
+msgstr ""
+
+#: ../../include/features.php:96
+msgid "Add categories to your posts"
+msgstr ""
+
+#: ../../include/features.php:97
+msgid "Ability to file posts under folders"
+msgstr ""
+
+#: ../../include/features.php:98
+msgid "Dislike Posts"
+msgstr ""
+
+#: ../../include/features.php:98
+msgid "Ability to dislike posts/comments"
+msgstr ""
+
+#: ../../include/features.php:99
+msgid "Star Posts"
+msgstr ""
+
+#: ../../include/features.php:99
+msgid "Ability to mark special posts with a star indicator"
+msgstr ""
+
+#: ../../include/features.php:100
+msgid "Tag Cloud"
+msgstr ""
+
+#: ../../include/features.php:100
+msgid "Provide a personal tag cloud on your channel page"
+msgstr ""
+
+#: ../../include/follow.php:28
+msgid "Channel is blocked on this site."
+msgstr ""
+
+#: ../../include/follow.php:33
+msgid "Channel location missing."
+msgstr ""
+
+#: ../../include/follow.php:82
+msgid "Response from remote channel was incomplete."
+msgstr ""
+
+#: ../../include/follow.php:99
+msgid "Channel was deleted and no longer exists."
+msgstr ""
+
+#: ../../include/follow.php:155 ../../include/follow.php:191
+msgid "Protocol disabled."
+msgstr ""
+
+#: ../../include/follow.php:179
+msgid "Channel discovery failed."
+msgstr ""
+
+#: ../../include/follow.php:217
+msgid "Cannot connect to yourself."
+msgstr ""
+
+#: ../../include/group.php:26
+msgid ""
+"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."
+msgstr ""
+
+#: ../../include/group.php:248
+msgid "Add new connections to this privacy group"
+msgstr ""
+
+#: ../../include/group.php:289
+msgid "edit"
+msgstr ""
+
+#: ../../include/group.php:312
+msgid "Edit group"
+msgstr ""
+
+#: ../../include/group.php:313
+msgid "Add privacy group"
+msgstr ""
+
+#: ../../include/group.php:314
+msgid "Channels not in any privacy group"
+msgstr ""
+
+#: ../../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 ""
+
+#: ../../include/bbcode.php:162 ../../include/bbcode.php:898
+msgid "Encrypted content"
+msgstr ""
+
+#: ../../include/bbcode.php:179
+#, php-format
+msgid "Install %s element: "
+msgstr ""
+
+#: ../../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 ""
+
+#: ../../include/bbcode.php:255
+#, php-format
+msgid "%1$s wrote the following %2$s %3$s"
+msgstr ""
+
+#: ../../include/bbcode.php:333 ../../include/bbcode.php:341
+msgid "Click to open/close"
+msgstr ""
+
+#: ../../include/bbcode.php:341
+msgid "spoiler"
+msgstr ""
+
+#: ../../include/bbcode.php:586
+msgid "Different viewers will see this text differently"
+msgstr ""
+
+#: ../../include/bbcode.php:836
+msgid "$1 wrote:"
+msgstr ""
+
+#: ../../include/conversation.php:204
+#, php-format
+msgid "%1$s is now connected with %2$s"
+msgstr ""
+
+#: ../../include/conversation.php:239
+#, php-format
+msgid "%1$s poked %2$s"
+msgstr ""
+
+#: ../../include/conversation.php:243 ../../include/text.php:1021
+#: ../../include/text.php:1026
+msgid "poked"
+msgstr ""
+
+#: ../../include/conversation.php:691
+#, php-format
+msgid "View %s's profile @ %s"
+msgstr ""
+
+#: ../../include/conversation.php:710
+msgid "Categories:"
+msgstr ""
+
+#: ../../include/conversation.php:711
+msgid "Filed under:"
+msgstr ""
+
+#: ../../include/conversation.php:738
+msgid "View in context"
+msgstr ""
+
+#: ../../include/conversation.php:850
+msgid "remove"
+msgstr ""
+
+#: ../../include/conversation.php:855
+msgid "Delete Selected Items"
+msgstr ""
+
+#: ../../include/conversation.php:953
+msgid "View Source"
+msgstr ""
+
+#: ../../include/conversation.php:954
+msgid "Follow Thread"
+msgstr ""
+
+#: ../../include/conversation.php:955
+msgid "Unfollow Thread"
+msgstr ""
+
+#: ../../include/conversation.php:960
+msgid "Activity/Posts"
+msgstr ""
+
+#: ../../include/conversation.php:962
+msgid "Edit Connection"
+msgstr ""
+
+#: ../../include/conversation.php:963
+msgid "Message"
+msgstr ""
+
+#: ../../include/conversation.php:1080
+#, php-format
+msgid "%s likes this."
+msgstr ""
+
+#: ../../include/conversation.php:1080
+#, php-format
+msgid "%s doesn't like this."
+msgstr ""
+
+#: ../../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] ""
+msgstr[1] ""
+
+#: ../../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] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1092
+msgid "and"
+msgstr ""
+
+#: ../../include/conversation.php:1095
+#, php-format
+msgid ", and %d other people"
+msgid_plural ", and %d other people"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1096
+#, php-format
+msgid "%s like this."
+msgstr ""
+
+#: ../../include/conversation.php:1096
+#, php-format
+msgid "%s don't like this."
+msgstr ""
+
+#: ../../include/conversation.php:1136
+msgid "Set your location"
+msgstr ""
+
+#: ../../include/conversation.php:1137
+msgid "Clear browser location"
+msgstr ""
+
+#: ../../include/conversation.php:1183
+msgid "Tag term:"
+msgstr ""
+
+#: ../../include/conversation.php:1184
+msgid "Where are you right now?"
+msgstr ""
+
+#: ../../include/conversation.php:1216
+msgid "Page link name"
+msgstr ""
+
+#: ../../include/conversation.php:1219
+msgid "Post as"
+msgstr ""
+
+#: ../../include/conversation.php:1229
+msgid "Toggle voting"
+msgstr ""
+
+#: ../../include/conversation.php:1237
+msgid "Categories (optional, comma-separated list)"
+msgstr ""
+
+#: ../../include/conversation.php:1260
+msgid "Set publish date"
+msgstr ""
+
+#: ../../include/conversation.php:1264
+msgid "OK"
+msgstr ""
+
+#: ../../include/conversation.php:1509
+msgid "Discover"
+msgstr ""
+
+#: ../../include/conversation.php:1512
+msgid "Imported public streams"
+msgstr ""
+
+#: ../../include/conversation.php:1517
+msgid "Commented Order"
+msgstr ""
+
+#: ../../include/conversation.php:1520
+msgid "Sort by Comment Date"
+msgstr ""
+
+#: ../../include/conversation.php:1524
+msgid "Posted Order"
+msgstr ""
+
+#: ../../include/conversation.php:1527
+msgid "Sort by Post Date"
+msgstr ""
+
+#: ../../include/conversation.php:1535
+msgid "Posts that mention or involve you"
+msgstr ""
+
+#: ../../include/conversation.php:1544
+msgid "Activity Stream - by date"
+msgstr ""
+
+#: ../../include/conversation.php:1550
+msgid "Starred"
+msgstr ""
+
+#: ../../include/conversation.php:1553
+msgid "Favourite Posts"
+msgstr ""
+
+#: ../../include/conversation.php:1560
+msgid "Spam"
+msgstr ""
+
+#: ../../include/conversation.php:1563
+msgid "Posts flagged as SPAM"
+msgstr ""
+
+#: ../../include/conversation.php:1620
+msgid "Status Messages and Posts"
+msgstr ""
+
+#: ../../include/conversation.php:1629
+msgid "About"
+msgstr ""
+
+#: ../../include/conversation.php:1632
+msgid "Profile Details"
+msgstr ""
+
+#: ../../include/conversation.php:1648
+msgid "Files and Storage"
+msgstr ""
+
+#: ../../include/conversation.php:1685
+msgid "Saved Bookmarks"
+msgstr ""
+
+#: ../../include/conversation.php:1695
+msgid "Manage Webpages"
+msgstr ""
+
+#: ../../include/conversation.php:1754
+msgctxt "noun"
+msgid "Attending"
+msgid_plural "Attending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1757
+msgctxt "noun"
+msgid "Not Attending"
+msgid_plural "Not Attending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1760
+msgctxt "noun"
+msgid "Undecided"
+msgid_plural "Undecided"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1763
+msgctxt "noun"
+msgid "Agree"
+msgid_plural "Agrees"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1766
+msgctxt "noun"
+msgid "Disagree"
+msgid_plural "Disagrees"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1769
+msgctxt "noun"
+msgid "Abstain"
+msgid_plural "Abstains"
+msgstr[0] ""
+msgstr[1] ""
+
 #: ../../include/text.php:423
 msgid "prev"
 msgstr ""
@@ -7969,11 +8761,6 @@ msgstr ""
 msgid "poke"
 msgstr ""
 
-#: ../../include/text.php:1021 ../../include/text.php:1026
-#: ../../include/conversation.php:243
-msgid "poked"
-msgstr ""
-
 #: ../../include/text.php:1027
 msgid "ping"
 msgstr ""
@@ -8210,361 +8997,18 @@ msgstr ""
 msgid "Select an alternate language"
 msgstr ""
 
-#: ../../include/text.php:1982
+#: ../../include/text.php:1965
 msgid "activity"
 msgstr ""
 
-#: ../../include/text.php:2277
+#: ../../include/text.php:2274
 msgid "Design Tools"
 msgstr ""
 
-#: ../../include/text.php:2283
+#: ../../include/text.php:2280
 msgid "Pages"
 msgstr ""
 
-#: ../../include/features.php:48
-msgid "General Features"
-msgstr ""
-
-#: ../../include/features.php:50
-msgid "Content Expiration"
-msgstr ""
-
-#: ../../include/features.php:50
-msgid "Remove posts/comments and/or private messages at a future time"
-msgstr ""
-
-#: ../../include/features.php:51
-msgid "Multiple Profiles"
-msgstr ""
-
-#: ../../include/features.php:51
-msgid "Ability to create multiple profiles"
-msgstr ""
-
-#: ../../include/features.php:52
-msgid "Advanced Profiles"
-msgstr ""
-
-#: ../../include/features.php:52
-msgid "Additional profile sections and selections"
-msgstr ""
-
-#: ../../include/features.php:53
-msgid "Profile Import/Export"
-msgstr ""
-
-#: ../../include/features.php:53
-msgid "Save and load profile details across sites/channels"
-msgstr ""
-
-#: ../../include/features.php:54
-msgid "Web Pages"
-msgstr ""
-
-#: ../../include/features.php:54
-msgid "Provide managed web pages on your channel"
-msgstr ""
-
-#: ../../include/features.php:55
-msgid "Hide Rating"
-msgstr ""
-
-#: ../../include/features.php:55
-msgid ""
-"Hide the rating buttons on your channel and profile pages. Note: People can "
-"still rate you somewhere else."
-msgstr ""
-
-#: ../../include/features.php:56
-msgid "Private Notes"
-msgstr ""
-
-#: ../../include/features.php:56
-msgid "Enables a tool to store notes and reminders (note: not encrypted)"
-msgstr ""
-
-#: ../../include/features.php:57
-msgid "Navigation Channel Select"
-msgstr ""
-
-#: ../../include/features.php:57
-msgid "Change channels directly from within the navigation dropdown menu"
-msgstr ""
-
-#: ../../include/features.php:58
-msgid "Photo Location"
-msgstr ""
-
-#: ../../include/features.php:58
-msgid "If location data is available on uploaded photos, link this to a map."
-msgstr ""
-
-#: ../../include/features.php:59
-msgid "Access Controlled Chatrooms"
-msgstr ""
-
-#: ../../include/features.php:59
-msgid "Provide chatrooms and chat services with access control."
-msgstr ""
-
-#: ../../include/features.php:60
-msgid "Smart Birthdays"
-msgstr ""
-
-#: ../../include/features.php:60
-msgid ""
-"Make birthday events timezone aware in case your friends are scattered "
-"across the planet."
-msgstr ""
-
-#: ../../include/features.php:61
-msgid "Expert Mode"
-msgstr ""
-
-#: ../../include/features.php:61
-msgid "Enable Expert Mode to provide advanced configuration options"
-msgstr ""
-
-#: ../../include/features.php:62
-msgid "Premium Channel"
-msgstr ""
-
-#: ../../include/features.php:62
-msgid ""
-"Allows you to set restrictions and terms on those that connect with your "
-"channel"
-msgstr ""
-
-#: ../../include/features.php:67
-msgid "Post Composition Features"
-msgstr ""
-
-#: ../../include/features.php:70
-msgid "Large Photos"
-msgstr ""
-
-#: ../../include/features.php:70
-msgid ""
-"Include large (1024px) photo thumbnails in posts. If not enabled, use small "
-"(640px) photo thumbnails"
-msgstr ""
-
-#: ../../include/features.php:71
-msgid "Automatically import channel content from other channels or feeds"
-msgstr ""
-
-#: ../../include/features.php:72
-msgid "Even More Encryption"
-msgstr ""
-
-#: ../../include/features.php:72
-msgid ""
-"Allow optional encryption of content end-to-end with a shared secret key"
-msgstr ""
-
-#: ../../include/features.php:73
-msgid "Enable Voting Tools"
-msgstr ""
-
-#: ../../include/features.php:73
-msgid "Provide a class of post which others can vote on"
-msgstr ""
-
-#: ../../include/features.php:74
-msgid "Delayed Posting"
-msgstr ""
-
-#: ../../include/features.php:74
-msgid "Allow posts to be published at a later date"
-msgstr ""
-
-#: ../../include/features.php:75
-msgid "Suppress Duplicate Posts/Comments"
-msgstr ""
-
-#: ../../include/features.php:75
-msgid ""
-"Prevent posts with identical content to be published with less than two "
-"minutes in between submissions."
-msgstr ""
-
-#: ../../include/features.php:81
-msgid "Network and Stream Filtering"
-msgstr ""
-
-#: ../../include/features.php:82
-msgid "Search by Date"
-msgstr ""
-
-#: ../../include/features.php:82
-msgid "Ability to select posts by date ranges"
-msgstr ""
-
-#: ../../include/features.php:83 ../../include/group.php:311
-msgid "Privacy Groups"
-msgstr ""
-
-#: ../../include/features.php:83
-msgid "Enable management and selection of privacy groups"
-msgstr ""
-
-#: ../../include/features.php:84
-msgid "Save search terms for re-use"
-msgstr ""
-
-#: ../../include/features.php:85
-msgid "Network Personal Tab"
-msgstr ""
-
-#: ../../include/features.php:85
-msgid "Enable tab to display only Network posts that you've interacted on"
-msgstr ""
-
-#: ../../include/features.php:86
-msgid "Network New Tab"
-msgstr ""
-
-#: ../../include/features.php:86
-msgid "Enable tab to display all new Network activity"
-msgstr ""
-
-#: ../../include/features.php:87
-msgid "Affinity Tool"
-msgstr ""
-
-#: ../../include/features.php:87
-msgid "Filter stream activity by depth of relationships"
-msgstr ""
-
-#: ../../include/features.php:88
-msgid "Connection Filtering"
-msgstr ""
-
-#: ../../include/features.php:88
-msgid "Filter incoming posts from connections based on keywords/content"
-msgstr ""
-
-#: ../../include/features.php:89
-msgid "Show channel suggestions"
-msgstr ""
-
-#: ../../include/features.php:94
-msgid "Post/Comment Tools"
-msgstr ""
-
-#: ../../include/features.php:95
-msgid "Community Tagging"
-msgstr ""
-
-#: ../../include/features.php:95
-msgid "Ability to tag existing posts"
-msgstr ""
-
-#: ../../include/features.php:96
-msgid "Post Categories"
-msgstr ""
-
-#: ../../include/features.php:96
-msgid "Add categories to your posts"
-msgstr ""
-
-#: ../../include/features.php:97
-msgid "Ability to file posts under folders"
-msgstr ""
-
-#: ../../include/features.php:98
-msgid "Dislike Posts"
-msgstr ""
-
-#: ../../include/features.php:98
-msgid "Ability to dislike posts/comments"
-msgstr ""
-
-#: ../../include/features.php:99
-msgid "Star Posts"
-msgstr ""
-
-#: ../../include/features.php:99
-msgid "Ability to mark special posts with a star indicator"
-msgstr ""
-
-#: ../../include/features.php:100
-msgid "Tag Cloud"
-msgstr ""
-
-#: ../../include/features.php:100
-msgid "Provide a personal tag cloud on your channel page"
-msgstr ""
-
-#: ../../include/follow.php:28
-msgid "Channel is blocked on this site."
-msgstr ""
-
-#: ../../include/follow.php:33
-msgid "Channel location missing."
-msgstr ""
-
-#: ../../include/follow.php:82
-msgid "Response from remote channel was incomplete."
-msgstr ""
-
-#: ../../include/follow.php:99
-msgid "Channel was deleted and no longer exists."
-msgstr ""
-
-#: ../../include/follow.php:155 ../../include/follow.php:191
-msgid "Protocol disabled."
-msgstr ""
-
-#: ../../include/follow.php:179
-msgid "Channel discovery failed."
-msgstr ""
-
-#: ../../include/follow.php:217
-msgid "Cannot connect to yourself."
-msgstr ""
-
-#: ../../include/group.php:26
-msgid ""
-"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."
-msgstr ""
-
-#: ../../include/group.php:248
-msgid "Add new connections to this privacy group"
-msgstr ""
-
-#: ../../include/group.php:289
-msgid "edit"
-msgstr ""
-
-#: ../../include/group.php:312
-msgid "Edit group"
-msgstr ""
-
-#: ../../include/group.php:313
-msgid "Add privacy group"
-msgstr ""
-
-#: ../../include/group.php:314
-msgid "Channels not in any privacy group"
-msgstr ""
-
-#: ../../include/network.php:659
-msgid "view full size"
-msgstr ""
-
-#: ../../include/network.php:1875 ../../include/account.php:317
-#: ../../include/account.php:344 ../../include/account.php:404
-msgid "Administrator"
-msgstr ""
-
-#: ../../include/network.php:1889
-msgid "No Subject"
-msgstr ""
-
 #: ../../include/account.php:28
 msgid "Not a valid email address"
 msgstr ""
@@ -8637,315 +9081,6 @@ msgstr ""
 msgid "This action is not available under your subscription plan."
 msgstr ""
 
-#: ../../include/bbcode.php:123 ../../include/bbcode.php:863
-#: ../../include/bbcode.php:866 ../../include/bbcode.php:871
-#: ../../include/bbcode.php:874 ../../include/bbcode.php:877
-#: ../../include/bbcode.php:880 ../../include/bbcode.php:885
-#: ../../include/bbcode.php:888 ../../include/bbcode.php:893
-#: ../../include/bbcode.php:896 ../../include/bbcode.php:899
-#: ../../include/bbcode.php:902
-msgid "Image/photo"
-msgstr ""
-
-#: ../../include/bbcode.php:162 ../../include/bbcode.php:913
-msgid "Encrypted content"
-msgstr ""
-
-#: ../../include/bbcode.php:179
-#, php-format
-msgid "Install %s element: "
-msgstr ""
-
-#: ../../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 ""
-
-#: ../../include/bbcode.php:255
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
-msgstr ""
-
-#: ../../include/bbcode.php:333 ../../include/bbcode.php:341
-msgid "Click to open/close"
-msgstr ""
-
-#: ../../include/bbcode.php:341
-msgid "spoiler"
-msgstr ""
-
-#: ../../include/bbcode.php:598
-msgid "Different viewers will see this text differently"
-msgstr ""
-
-#: ../../include/bbcode.php:851
-msgid "$1 wrote:"
-msgstr ""
-
-#: ../../include/conversation.php:204
-#, php-format
-msgid "%1$s is now connected with %2$s"
-msgstr ""
-
-#: ../../include/conversation.php:239
-#, php-format
-msgid "%1$s poked %2$s"
-msgstr ""
-
-#: ../../include/conversation.php:691
-#, php-format
-msgid "View %s's profile @ %s"
-msgstr ""
-
-#: ../../include/conversation.php:710
-msgid "Categories:"
-msgstr ""
-
-#: ../../include/conversation.php:711
-msgid "Filed under:"
-msgstr ""
-
-#: ../../include/conversation.php:738
-msgid "View in context"
-msgstr ""
-
-#: ../../include/conversation.php:850
-msgid "remove"
-msgstr ""
-
-#: ../../include/conversation.php:854 ../../include/nav.php:247
-msgid "Loading..."
-msgstr ""
-
-#: ../../include/conversation.php:855
-msgid "Delete Selected Items"
-msgstr ""
-
-#: ../../include/conversation.php:953
-msgid "View Source"
-msgstr ""
-
-#: ../../include/conversation.php:954
-msgid "Follow Thread"
-msgstr ""
-
-#: ../../include/conversation.php:955
-msgid "Unfollow Thread"
-msgstr ""
-
-#: ../../include/conversation.php:960
-msgid "Activity/Posts"
-msgstr ""
-
-#: ../../include/conversation.php:962
-msgid "Edit Connection"
-msgstr ""
-
-#: ../../include/conversation.php:963
-msgid "Message"
-msgstr ""
-
-#: ../../include/conversation.php:1080
-#, php-format
-msgid "%s likes this."
-msgstr ""
-
-#: ../../include/conversation.php:1080
-#, php-format
-msgid "%s doesn't like this."
-msgstr ""
-
-#: ../../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] ""
-msgstr[1] ""
-
-#: ../../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] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1092
-msgid "and"
-msgstr ""
-
-#: ../../include/conversation.php:1095
-#, php-format
-msgid ", and %d other people"
-msgid_plural ", and %d other people"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1096
-#, php-format
-msgid "%s like this."
-msgstr ""
-
-#: ../../include/conversation.php:1096
-#, php-format
-msgid "%s don't like this."
-msgstr ""
-
-#: ../../include/conversation.php:1136
-msgid "Set your location"
-msgstr ""
-
-#: ../../include/conversation.php:1137
-msgid "Clear browser location"
-msgstr ""
-
-#: ../../include/conversation.php:1187
-msgid "Tag term:"
-msgstr ""
-
-#: ../../include/conversation.php:1188
-msgid "Where are you right now?"
-msgstr ""
-
-#: ../../include/conversation.php:1220
-msgid "Page link name"
-msgstr ""
-
-#: ../../include/conversation.php:1223
-msgid "Post as"
-msgstr ""
-
-#: ../../include/conversation.php:1233
-msgid "Toggle voting"
-msgstr ""
-
-#: ../../include/conversation.php:1264
-msgid "Set publish date"
-msgstr ""
-
-#: ../../include/conversation.php:1268
-msgid "OK"
-msgstr ""
-
-#: ../../include/conversation.php:1513
-msgid "Discover"
-msgstr ""
-
-#: ../../include/conversation.php:1516
-msgid "Imported public streams"
-msgstr ""
-
-#: ../../include/conversation.php:1521
-msgid "Commented Order"
-msgstr ""
-
-#: ../../include/conversation.php:1524
-msgid "Sort by Comment Date"
-msgstr ""
-
-#: ../../include/conversation.php:1528
-msgid "Posted Order"
-msgstr ""
-
-#: ../../include/conversation.php:1531
-msgid "Sort by Post Date"
-msgstr ""
-
-#: ../../include/conversation.php:1539
-msgid "Posts that mention or involve you"
-msgstr ""
-
-#: ../../include/conversation.php:1548
-msgid "Activity Stream - by date"
-msgstr ""
-
-#: ../../include/conversation.php:1554
-msgid "Starred"
-msgstr ""
-
-#: ../../include/conversation.php:1557
-msgid "Favourite Posts"
-msgstr ""
-
-#: ../../include/conversation.php:1564
-msgid "Spam"
-msgstr ""
-
-#: ../../include/conversation.php:1567
-msgid "Posts flagged as SPAM"
-msgstr ""
-
-#: ../../include/conversation.php:1624
-msgid "Status Messages and Posts"
-msgstr ""
-
-#: ../../include/conversation.php:1633
-msgid "About"
-msgstr ""
-
-#: ../../include/conversation.php:1636
-msgid "Profile Details"
-msgstr ""
-
-#: ../../include/conversation.php:1652
-msgid "Files and Storage"
-msgstr ""
-
-#: ../../include/conversation.php:1686 ../../include/nav.php:102
-msgid "Bookmarks"
-msgstr ""
-
-#: ../../include/conversation.php:1689
-msgid "Saved Bookmarks"
-msgstr ""
-
-#: ../../include/conversation.php:1699
-msgid "Manage Webpages"
-msgstr ""
-
-#: ../../include/conversation.php:1758
-msgctxt "noun"
-msgid "Attending"
-msgid_plural "Attending"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1761
-msgctxt "noun"
-msgid "Not Attending"
-msgid_plural "Not Attending"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1764
-msgctxt "noun"
-msgid "Undecided"
-msgid_plural "Undecided"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1767
-msgctxt "noun"
-msgid "Agree"
-msgid_plural "Agrees"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1770
-msgctxt "noun"
-msgid "Disagree"
-msgid_plural "Disagrees"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1773
-msgctxt "noun"
-msgid "Abstain"
-msgid_plural "Abstains"
-msgstr[0] ""
-msgstr[1] ""
-
 #: ../../include/taxonomy.php:228 ../../include/taxonomy.php:249
 msgid "Tags"
 msgstr ""
@@ -8978,6 +9113,63 @@ msgstr ""
 msgid "dislikes"
 msgstr ""
 
+#: ../../include/PermissionDescription.php:115
+msgid "Only me"
+msgstr ""
+
+#: ../../include/PermissionDescription.php:116
+msgid "Public"
+msgstr ""
+
+#: ../../include/PermissionDescription.php:117
+msgid "Anybody in the $Projectname network"
+msgstr ""
+
+#: ../../include/PermissionDescription.php:118
+#, php-format
+msgid "Any account on %s"
+msgstr ""
+
+#: ../../include/PermissionDescription.php:119
+msgid "Any of my connections"
+msgstr ""
+
+#: ../../include/PermissionDescription.php:124
+msgid "Only me (only specified contacts and me)"
+msgstr ""
+
+#: ../../include/PermissionDescription.php:125
+msgid "Anybody authenticated (could include visitors from other networks)"
+msgstr ""
+
+#: ../../include/PermissionDescription.php:126
+msgid "Any connections including those who haven't yet been approved"
+msgstr ""
+
+#: ../../include/PermissionDescription.php:169
+msgid ""
+"This is your default setting for the audience of your normal stream, and "
+"posts."
+msgstr ""
+
+#: ../../include/PermissionDescription.php:170
+msgid ""
+"This is your default setting for who can view your default channel profile"
+msgstr ""
+
+#: ../../include/PermissionDescription.php:171
+msgid "This is your default setting for who can view your connections"
+msgstr ""
+
+#: ../../include/PermissionDescription.php:172
+msgid ""
+"This is your default setting for who can view your file storage and photos"
+msgstr ""
+
+#: ../../include/PermissionDescription.php:173
+msgid "This is your default setting for the audience of your webpages"
+msgstr ""
+
 #: ../../include/js_strings.php:5
 msgid "Delete this item?"
 msgstr ""
@@ -9238,173 +9430,8 @@ msgstr ""
 msgid "Stored post could not be verified."
 msgstr ""
 
-#: ../../include/nav.php:82 ../../include/nav.php:113 ../../boot.php:1614
-msgid "Logout"
-msgstr ""
-
-#: ../../include/nav.php:82 ../../include/nav.php:113
-msgid "End this session"
-msgstr ""
-
-#: ../../include/nav.php:85 ../../include/nav.php:144
-msgid "Home"
-msgstr ""
-
-#: ../../include/nav.php:85
-msgid "Your posts and conversations"
-msgstr ""
-
-#: ../../include/nav.php:86
-msgid "Your profile page"
-msgstr ""
-
-#: ../../include/nav.php:88
-msgid "Manage/Edit profiles"
-msgstr ""
-
-#: ../../include/nav.php:90
-msgid "Edit your profile"
-msgstr ""
-
-#: ../../include/nav.php:92
-msgid "Your photos"
-msgstr ""
-
-#: ../../include/nav.php:93
-msgid "Your files"
-msgstr ""
-
-#: ../../include/nav.php:96
-msgid "Your chatrooms"
-msgstr ""
-
-#: ../../include/nav.php:102
-msgid "Your bookmarks"
-msgstr ""
-
-#: ../../include/nav.php:106
-msgid "Your webpages"
-msgstr ""
-
-#: ../../include/nav.php:110
-msgid "Sign in"
-msgstr ""
-
-#: ../../include/nav.php:127
-#, php-format
-msgid "%s - click to logout"
-msgstr ""
-
-#: ../../include/nav.php:130
-msgid "Remote authentication"
-msgstr ""
-
-#: ../../include/nav.php:130
-msgid "Click to authenticate to your home hub"
-msgstr ""
-
-#: ../../include/nav.php:144
-msgid "Home Page"
-msgstr ""
-
-#: ../../include/nav.php:147
-msgid "Create an account"
-msgstr ""
-
-#: ../../include/nav.php:159
-msgid "Help and documentation"
-msgstr ""
-
-#: ../../include/nav.php:163
-msgid "Applications, utilities, links, games"
-msgstr ""
-
-#: ../../include/nav.php:165
-msgid "Search site @name, #tag, ?docs, content"
-msgstr ""
-
-#: ../../include/nav.php:167
-msgid "Channel Directory"
-msgstr ""
-
-#: ../../include/nav.php:179
-msgid "Your grid"
-msgstr ""
-
-#: ../../include/nav.php:180
-msgid "Mark all grid notifications seen"
-msgstr ""
-
-#: ../../include/nav.php:182
-msgid "Channel home"
-msgstr ""
-
-#: ../../include/nav.php:183
-msgid "Mark all channel notifications seen"
-msgstr ""
-
-#: ../../include/nav.php:189
-msgid "Notices"
-msgstr ""
-
-#: ../../include/nav.php:189
-msgid "Notifications"
-msgstr ""
-
-#: ../../include/nav.php:190
-msgid "See all notifications"
-msgstr ""
-
-#: ../../include/nav.php:193
-msgid "Private mail"
-msgstr ""
-
-#: ../../include/nav.php:194
-msgid "See all private messages"
-msgstr ""
-
-#: ../../include/nav.php:195
-msgid "Mark all private messages seen"
-msgstr ""
-
-#: ../../include/nav.php:201
-msgid "Event Calendar"
-msgstr ""
-
-#: ../../include/nav.php:202
-msgid "See all events"
-msgstr ""
-
-#: ../../include/nav.php:203
-msgid "Mark all events seen"
-msgstr ""
-
-#: ../../include/nav.php:206
-msgid "Manage Your Channels"
-msgstr ""
-
-#: ../../include/nav.php:208
-msgid "Account/Channel Settings"
-msgstr ""
-
-#: ../../include/nav.php:216
-msgid "Site Setup and Configuration"
-msgstr ""
-
-#: ../../include/nav.php:252
-msgid "@name, #tag, ?doc, content"
-msgstr ""
-
-#: ../../include/nav.php:253
-msgid "Please wait..."
-msgstr ""
-
-#: ../../include/oembed.php:324
-msgid "Embedded content"
-msgstr ""
-
-#: ../../include/oembed.php:333
-msgid "Embedding disabled"
+#: ../../include/api.php:1338
+msgid "Public Timeline"
 msgstr ""
 
 #: ../../include/page_widgets.php:6
@@ -9555,25 +9582,60 @@ msgstr ""
 msgid "Custom/Expert Mode"
 msgstr ""
 
-#: ../../include/zot.php:680
-msgid "Invalid data packet"
+#: ../../include/apps.php:155
+msgid "Site Admin"
 msgstr ""
 
-#: ../../include/zot.php:696
-msgid "Unable to verify channel signature"
+#: ../../include/apps.php:156
+msgid "Bug Report"
 msgstr ""
 
-#: ../../include/zot.php:2332
-#, php-format
-msgid "Unable to verify site signature for %s"
+#: ../../include/apps.php:157
+msgid "View Bookmarks"
 msgstr ""
 
-#: ../../include/zot.php:3670
-msgid "invalid target signature"
+#: ../../include/apps.php:158
+msgid "My Chatrooms"
 msgstr ""
 
-#: ../../include/api.php:1338
-msgid "Public Timeline"
+#: ../../include/apps.php:160
+msgid "Firefox Share"
+msgstr ""
+
+#: ../../include/apps.php:161
+msgid "Remote Diagnostics"
+msgstr ""
+
+#: ../../include/apps.php:180
+msgid "Probe"
+msgstr ""
+
+#: ../../include/apps.php:181
+msgid "Suggest"
+msgstr ""
+
+#: ../../include/apps.php:182
+msgid "Random Channel"
+msgstr ""
+
+#: ../../include/apps.php:183
+msgid "Invite"
+msgstr ""
+
+#: ../../include/apps.php:186
+msgid "Post"
+msgstr ""
+
+#: ../../include/apps.php:289
+msgid "Purchase"
+msgstr ""
+
+#: ../../include/bb2diaspora.php:398
+msgid "Attachments:"
+msgstr ""
+
+#: ../../include/bb2diaspora.php:489
+msgid "$Projectname event notification:"
 msgstr ""
 
 #: ../../view/theme/redbasic/php/config.php:82
@@ -9750,24 +9812,24 @@ msgstr ""
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:2254
+#: ../../boot.php:2269
 msgid "toggle mobile"
 msgstr ""
 
-#: ../../boot.php:2407
+#: ../../boot.php:2422
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr ""
 
-#: ../../boot.php:2410
+#: ../../boot.php:2425
 #, php-format
 msgid "[hubzilla] Website SSL error for %s"
 msgstr ""
 
-#: ../../boot.php:2447
+#: ../../boot.php:2462
 msgid "Cron/Scheduled tasks not running."
 msgstr ""
 
-#: ../../boot.php:2451
+#: ../../boot.php:2466
 #, php-format
 msgid "[hubzilla] Cron tasks not running on %s"
 msgstr ""
diff --git a/view/de/hmessages.po b/view/de/hmessages.po
index b91a54d6b..966acced9 100644
--- a/view/de/hmessages.po
+++ b/view/de/hmessages.po
@@ -23,8 +23,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Redmatrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-22 00:01-0700\n"
-"PO-Revision-Date: 2016-04-22 17:48+0000\n"
+"POT-Creation-Date: 2016-05-13 00:02-0700\n"
+"PO-Revision-Date: 2016-05-16 12:43+0000\n"
 "Last-Translator: Phellmes <forum@suschka.de>\n"
 "Language-Team: German (http://www.transifex.com/Friendica/red-matrix/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -37,7 +37,7 @@ msgstr ""
 msgid "parent"
 msgstr "Ãœbergeordnetes Verzeichnis"
 
-#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2633
+#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2632
 msgid "Collection"
 msgstr "Sammlung"
 
@@ -61,16 +61,16 @@ msgstr "Posteingang für überwachte Kalender"
 msgid "Schedule Outbox"
 msgstr "Postausgang für überwachte Kalender"
 
-#: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Module/Photos.php:797
-#: ../../Zotlabs/Module/Photos.php:1241 ../../include/apps.php:360
-#: ../../include/apps.php:415 ../../include/conversation.php:1037
-#: ../../include/widgets.php:1457
+#: ../../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
 msgid "Unknown"
 msgstr "Unbekannt"
 
 #: ../../Zotlabs/Storage/Browser.php:226 ../../Zotlabs/Module/Fbrowser.php:85
-#: ../../include/apps.php:135 ../../include/conversation.php:1657
-#: ../../include/nav.php:93
+#: ../../include/nav.php:93 ../../include/conversation.php:1645
+#: ../../include/apps.php:167
 msgid "Files"
 msgstr "Dateien"
 
@@ -83,22 +83,22 @@ msgid "Shared"
 msgstr "Geteilt"
 
 #: ../../Zotlabs/Storage/Browser.php:230 ../../Zotlabs/Storage/Browser.php:303
-#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Layouts.php:180
+#: ../../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:188
+#: ../../Zotlabs/Module/Webpages.php:186
 msgid "Create"
 msgstr "Erstelle"
 
 #: ../../Zotlabs/Storage/Browser.php:231 ../../Zotlabs/Storage/Browser.php:305
 #: ../../Zotlabs/Module/Cover_photo.php:357
-#: ../../Zotlabs/Module/Photos.php:824 ../../Zotlabs/Module/Photos.php:1365
-#: ../../Zotlabs/Module/Profile_photo.php:368 ../../include/widgets.php:1470
+#: ../../Zotlabs/Module/Photos.php:825 ../../Zotlabs/Module/Photos.php:1367
+#: ../../Zotlabs/Module/Profile_photo.php:368 ../../include/widgets.php:1519
 msgid "Upload"
 msgstr "Hochladen"
 
-#: ../../Zotlabs/Storage/Browser.php:235 ../../Zotlabs/Module/Admin.php:1166
-#: ../../Zotlabs/Module/Chat.php:245 ../../Zotlabs/Module/Settings.php:590
-#: ../../Zotlabs/Module/Settings.php:616
+#: ../../Zotlabs/Storage/Browser.php:235 ../../Zotlabs/Module/Admin.php:1208
+#: ../../Zotlabs/Module/Chat.php:245 ../../Zotlabs/Module/Settings.php:592
+#: ../../Zotlabs/Module/Settings.php:618
 #: ../../Zotlabs/Module/Sharedwithme.php:99
 msgid "Name"
 msgstr "Name"
@@ -108,7 +108,7 @@ msgid "Type"
 msgstr "Typ"
 
 #: ../../Zotlabs/Storage/Browser.php:237
-#: ../../Zotlabs/Module/Sharedwithme.php:101 ../../include/text.php:1293
+#: ../../Zotlabs/Module/Sharedwithme.php:101 ../../include/text.php:1322
 msgid "Size"
 msgstr "Größe"
 
@@ -117,35 +117,35 @@ msgstr "Größe"
 msgid "Last Modified"
 msgstr "Zuletzt geändert"
 
-#: ../../Zotlabs/Storage/Browser.php:240 ../../Zotlabs/Module/Admin.php:1775
-#: ../../Zotlabs/Module/Blocks.php:159
+#: ../../Zotlabs/Storage/Browser.php:240 ../../Zotlabs/Module/Admin.php:2075
+#: ../../Zotlabs/Module/Blocks.php:157
 #: ../../Zotlabs/Module/Connections.php:290
 #: ../../Zotlabs/Module/Connections.php:310
-#: ../../Zotlabs/Module/Editblock.php:140
-#: ../../Zotlabs/Module/Editlayout.php:139
-#: ../../Zotlabs/Module/Editpost.php:118
-#: ../../Zotlabs/Module/Editwebpage.php:181
-#: ../../Zotlabs/Module/Layouts.php:188 ../../Zotlabs/Module/Menu.php:112
-#: ../../Zotlabs/Module/Settings.php:650 ../../Zotlabs/Module/Thing.php:260
-#: ../../Zotlabs/Module/Webpages.php:189 ../../include/identity.php:930
-#: ../../include/identity.php:934 ../../include/ItemObject.php:100
-#: ../../include/apps.php:259 ../../include/menu.php:108
-#: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36
+#: ../../Zotlabs/Module/Editblock.php:109
+#: ../../Zotlabs/Module/Editlayout.php:113
+#: ../../Zotlabs/Module/Editpost.php:84
+#: ../../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
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: ../../Zotlabs/Storage/Browser.php:241 ../../Zotlabs/Module/Admin.php:1001
-#: ../../Zotlabs/Module/Admin.php:1160 ../../Zotlabs/Module/Admin.php:1776
-#: ../../Zotlabs/Module/Blocks.php:161
+#: ../../Zotlabs/Storage/Browser.php:241 ../../Zotlabs/Module/Admin.php:1043
+#: ../../Zotlabs/Module/Admin.php:1202 ../../Zotlabs/Module/Admin.php:2076
+#: ../../Zotlabs/Module/Blocks.php:159
 #: ../../Zotlabs/Module/Connections.php:263
 #: ../../Zotlabs/Module/Connedit.php:573
-#: ../../Zotlabs/Module/Editblock.php:187
-#: ../../Zotlabs/Module/Editlayout.php:184
-#: ../../Zotlabs/Module/Editwebpage.php:228 ../../Zotlabs/Module/Group.php:177
-#: ../../Zotlabs/Module/Photos.php:1172 ../../Zotlabs/Module/Settings.php:651
-#: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Module/Webpages.php:191
-#: ../../include/ItemObject.php:120 ../../include/apps.php:260
-#: ../../include/conversation.php:657
+#: ../../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
 msgid "Delete"
 msgstr "Löschen"
 
@@ -173,42 +173,42 @@ msgstr "Datei hochladen"
 
 #: ../../Zotlabs/Web/Router.php:65 ../../Zotlabs/Module/Achievements.php:34
 #: ../../Zotlabs/Module/Api.php:13 ../../Zotlabs/Module/Api.php:18
-#: ../../Zotlabs/Module/Appman.php:70 ../../Zotlabs/Module/Authtest.php:16
+#: ../../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:104
-#: ../../Zotlabs/Module/Channel.php:224 ../../Zotlabs/Module/Channel.php:264
+#: ../../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/Module/Connedit.php:366
 #: ../../Zotlabs/Module/Cover_photo.php:277
 #: ../../Zotlabs/Module/Cover_photo.php:290
-#: ../../Zotlabs/Module/Editblock.php:69
+#: ../../Zotlabs/Module/Editblock.php:67
 #: ../../Zotlabs/Module/Editlayout.php:67
-#: ../../Zotlabs/Module/Editlayout.php:91 ../../Zotlabs/Module/Editpost.php:17
-#: ../../Zotlabs/Module/Editwebpage.php:68
+#: ../../Zotlabs/Module/Editlayout.php:90 ../../Zotlabs/Module/Editpost.php:17
+#: ../../Zotlabs/Module/Editwebpage.php:69
 #: ../../Zotlabs/Module/Editwebpage.php:90
 #: ../../Zotlabs/Module/Editwebpage.php:105
-#: ../../Zotlabs/Module/Editwebpage.php:129
-#: ../../Zotlabs/Module/Events.php:264 ../../Zotlabs/Module/Filestorage.php:22
-#: ../../Zotlabs/Module/Filestorage.php:77
-#: ../../Zotlabs/Module/Filestorage.php:92
-#: ../../Zotlabs/Module/Filestorage.php:119
+#: ../../Zotlabs/Module/Editwebpage.php:127
+#: ../../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/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:73 ../../Zotlabs/Module/Layouts.php:80
-#: ../../Zotlabs/Module/Layouts.php:91 ../../Zotlabs/Module/Like.php:181
+#: ../../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/Manage.php:10 ../../Zotlabs/Module/Menu.php:78
 #: ../../Zotlabs/Module/Message.php:20 ../../Zotlabs/Module/Mitem.php:115
-#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Network.php:16
+#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Network.php:17
 #: ../../Zotlabs/Module/New_channel.php:77
 #: ../../Zotlabs/Module/New_channel.php:104
 #: ../../Zotlabs/Module/Notifications.php:70 ../../Zotlabs/Module/Page.php:35
 #: ../../Zotlabs/Module/Page.php:90 ../../Zotlabs/Module/Pdledit.php:26
-#: ../../Zotlabs/Module/Photos.php:74 ../../Zotlabs/Module/Poke.php:137
+#: ../../Zotlabs/Module/Photos.php:75 ../../Zotlabs/Module/Poke.php:137
 #: ../../Zotlabs/Module/Profile.php:68 ../../Zotlabs/Module/Profile.php:76
 #: ../../Zotlabs/Module/Profile_photo.php:256
 #: ../../Zotlabs/Module/Profile_photo.php:269
@@ -216,22 +216,22 @@ msgstr "Datei hochladen"
 #: ../../Zotlabs/Module/Rate.php:115 ../../Zotlabs/Module/Register.php:77
 #: ../../Zotlabs/Module/Regmod.php:21
 #: ../../Zotlabs/Module/Service_limits.php:11
-#: ../../Zotlabs/Module/Settings.php:570 ../../Zotlabs/Module/Setup.php:238
+#: ../../Zotlabs/Module/Settings.php:572 ../../Zotlabs/Module/Setup.php:238
 #: ../../Zotlabs/Module/Sharedwithme.php:11
-#: ../../Zotlabs/Module/Sources.php:70 ../../Zotlabs/Module/Suggest.php:30
+#: ../../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/Viewsrc.php:18 ../../Zotlabs/Module/Webpages.php:73
-#: ../../include/chat.php:133 ../../include/attach.php:141
+#: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Webpages.php:74
+#: ../../include/photos.php:29 ../../include/chat.php:133
+#: ../../include/items.php:3439 ../../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:4671
-#: ../../include/photos.php:29 ../../index.php:174
+#: ../../include/attach.php:1118 ../../index.php:174
 msgid "Permission denied."
 msgstr "Berechtigung verweigert."
 
@@ -258,12 +258,12 @@ msgid "Welcome %s. Remote authentication successful."
 msgstr "Willkommen %s. Entfernte Authentifizierung erfolgreich."
 
 #: ../../Zotlabs/Module/Achievements.php:15 ../../Zotlabs/Module/Blocks.php:33
-#: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Editblock.php:33
+#: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Editblock.php:31
 #: ../../Zotlabs/Module/Editlayout.php:31
-#: ../../Zotlabs/Module/Editwebpage.php:32
-#: ../../Zotlabs/Module/Filestorage.php:58 ../../Zotlabs/Module/Hcard.php:12
-#: ../../Zotlabs/Module/Layouts.php:33 ../../Zotlabs/Module/Profile.php:20
-#: ../../Zotlabs/Module/Webpages.php:33 ../../include/identity.php:830
+#: ../../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
 msgid "Requested profile is not available."
 msgstr "Erwünschte Profil ist nicht verfügbar."
 
@@ -279,1034 +279,1128 @@ msgstr "Netzwerk"
 msgid "RSS"
 msgstr "RSS"
 
-#: ../../Zotlabs/Module/Admin.php:58
+#: ../../Zotlabs/Module/Admin.php:77
 msgid "Theme settings updated."
 msgstr "Theme-Einstellungen aktualisiert."
 
-#: ../../Zotlabs/Module/Admin.php:145 ../../Zotlabs/Module/Admin.php:1197
-#: ../../Zotlabs/Module/Admin.php:1442 ../../Zotlabs/Module/Display.php:44
-#: ../../Zotlabs/Module/Filestorage.php:31 ../../Zotlabs/Module/Thing.php:89
-#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:4592
+#: ../../Zotlabs/Module/Admin.php:164 ../../Zotlabs/Module/Admin.php:1239
+#: ../../Zotlabs/Module/Admin.php:1541 ../../Zotlabs/Module/Display.php:44
+#: ../../Zotlabs/Module/Filestorage.php:33 ../../Zotlabs/Module/Thing.php:89
+#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:3360
 msgid "Item not found."
 msgstr "Element nicht gefunden."
 
-#: ../../Zotlabs/Module/Admin.php:178
+#: ../../Zotlabs/Module/Admin.php:197
 msgid "# Accounts"
 msgstr "Anzahl der Konten"
 
-#: ../../Zotlabs/Module/Admin.php:179
+#: ../../Zotlabs/Module/Admin.php:198
 msgid "# blocked accounts"
 msgstr "Anzahl der blockierten Konten"
 
-#: ../../Zotlabs/Module/Admin.php:180
+#: ../../Zotlabs/Module/Admin.php:199
 msgid "# expired accounts"
 msgstr "Anzahl der abgelaufenen Konten"
 
-#: ../../Zotlabs/Module/Admin.php:181
+#: ../../Zotlabs/Module/Admin.php:200
 msgid "# expiring accounts"
 msgstr "Anzahl der ablaufenden Konten"
 
-#: ../../Zotlabs/Module/Admin.php:192
+#: ../../Zotlabs/Module/Admin.php:211
 msgid "# Channels"
 msgstr "Anzahl der Kanäle"
 
-#: ../../Zotlabs/Module/Admin.php:193
+#: ../../Zotlabs/Module/Admin.php:212
 msgid "# primary"
 msgstr "Anzahl der primären Kanäle"
 
-#: ../../Zotlabs/Module/Admin.php:194
+#: ../../Zotlabs/Module/Admin.php:213
 msgid "# clones"
 msgstr "Anzahl der Klone"
 
-#: ../../Zotlabs/Module/Admin.php:200
+#: ../../Zotlabs/Module/Admin.php:219
 msgid "Message queues"
 msgstr "Nachrichten-Warteschlangen"
 
-#: ../../Zotlabs/Module/Admin.php:216 ../../Zotlabs/Module/Admin.php:462
-#: ../../Zotlabs/Module/Admin.php:677 ../../Zotlabs/Module/Admin.php:717
-#: ../../Zotlabs/Module/Admin.php:992 ../../Zotlabs/Module/Admin.php:1156
-#: ../../Zotlabs/Module/Admin.php:1271 ../../Zotlabs/Module/Admin.php:1332
-#: ../../Zotlabs/Module/Admin.php:1493 ../../Zotlabs/Module/Admin.php:1527
-#: ../../Zotlabs/Module/Admin.php:1612
+#: ../../Zotlabs/Module/Admin.php:236
+msgid "Your software should be updated"
+msgstr "Die installierte Software sollte aktualisiert werden"
+
+#: ../../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:1592 ../../Zotlabs/Module/Admin.php:1626
+#: ../../Zotlabs/Module/Admin.php:1711
 msgid "Administration"
 msgstr "Administration"
 
-#: ../../Zotlabs/Module/Admin.php:217
+#: ../../Zotlabs/Module/Admin.php:242
 msgid "Summary"
 msgstr "Zusammenfassung"
 
-#: ../../Zotlabs/Module/Admin.php:220
+#: ../../Zotlabs/Module/Admin.php:245
 msgid "Registered accounts"
 msgstr "Registrierte Konten"
 
-#: ../../Zotlabs/Module/Admin.php:221 ../../Zotlabs/Module/Admin.php:681
+#: ../../Zotlabs/Module/Admin.php:246 ../../Zotlabs/Module/Admin.php:715
 msgid "Pending registrations"
 msgstr "Ausstehende Registrierungen"
 
-#: ../../Zotlabs/Module/Admin.php:222
+#: ../../Zotlabs/Module/Admin.php:247
 msgid "Registered channels"
 msgstr "Registrierte Kanäle"
 
-#: ../../Zotlabs/Module/Admin.php:223 ../../Zotlabs/Module/Admin.php:682
+#: ../../Zotlabs/Module/Admin.php:248 ../../Zotlabs/Module/Admin.php:716
 msgid "Active plugins"
 msgstr "Aktive Plug-Ins"
 
-#: ../../Zotlabs/Module/Admin.php:224
+#: ../../Zotlabs/Module/Admin.php:249
 msgid "Version"
 msgstr "Version"
 
-#: ../../Zotlabs/Module/Admin.php:345
+#: ../../Zotlabs/Module/Admin.php:250
+msgid "Repository version (master)"
+msgstr "Repository-Version (master)"
+
+#: ../../Zotlabs/Module/Admin.php:251
+msgid "Repository version (dev)"
+msgstr "Repository-Version (dev)"
+
+#: ../../Zotlabs/Module/Admin.php:373
 msgid "Site settings updated."
 msgstr "Site-Einstellungen aktualisiert."
 
-#: ../../Zotlabs/Module/Admin.php:372 ../../include/comanche.php:34
+#: ../../Zotlabs/Module/Admin.php:400 ../../include/text.php:2853
 msgid "Default"
 msgstr "Standard"
 
-#: ../../Zotlabs/Module/Admin.php:382 ../../Zotlabs/Module/Settings.php:796
+#: ../../Zotlabs/Module/Admin.php:410 ../../Zotlabs/Module/Settings.php:798
 msgid "mobile"
 msgstr "mobil"
 
-#: ../../Zotlabs/Module/Admin.php:384
+#: ../../Zotlabs/Module/Admin.php:412
 msgid "experimental"
 msgstr "experimentell"
 
-#: ../../Zotlabs/Module/Admin.php:386
+#: ../../Zotlabs/Module/Admin.php:414
 msgid "unsupported"
 msgstr "nicht unterstützt"
 
-#: ../../Zotlabs/Module/Admin.php:431 ../../Zotlabs/Module/Api.php:89
+#: ../../Zotlabs/Module/Admin.php:459 ../../Zotlabs/Module/Api.php:89
 #: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Connedit.php:657
-#: ../../Zotlabs/Module/Events.php:458 ../../Zotlabs/Module/Events.php:459
-#: ../../Zotlabs/Module/Events.php:468
-#: ../../Zotlabs/Module/Filestorage.php:155
-#: ../../Zotlabs/Module/Filestorage.php:163 ../../Zotlabs/Module/Menu.php:100
+#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:460
+#: ../../Zotlabs/Module/Events.php:469
+#: ../../Zotlabs/Module/Filestorage.php:157
+#: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Menu.php:100
 #: ../../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:665
+#: ../../Zotlabs/Module/Mitem.php:233 ../../Zotlabs/Module/Photos.php:666
 #: ../../Zotlabs/Module/Profiles.php:651 ../../Zotlabs/Module/Removeme.php:64
-#: ../../Zotlabs/Module/Settings.php:579 ../../include/dir_fns.php:141
+#: ../../Zotlabs/Module/Settings.php:581 ../../include/dir_fns.php:141
 #: ../../include/dir_fns.php:142 ../../include/dir_fns.php:143
 #: ../../view/theme/redbasic/php/config.php:105
-#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1606
+#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1619
 msgid "No"
 msgstr "Nein"
 
-#: ../../Zotlabs/Module/Admin.php:432
+#: ../../Zotlabs/Module/Admin.php:460
 msgid "Yes - with approval"
 msgstr "Ja - mit Zustimmung"
 
-#: ../../Zotlabs/Module/Admin.php:433 ../../Zotlabs/Module/Api.php:88
-#: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Events.php:458
-#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:468
-#: ../../Zotlabs/Module/Filestorage.php:155
-#: ../../Zotlabs/Module/Filestorage.php:163 ../../Zotlabs/Module/Menu.php:100
+#: ../../Zotlabs/Module/Admin.php:461 ../../Zotlabs/Module/Api.php:88
+#: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Events.php:459
+#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:469
+#: ../../Zotlabs/Module/Filestorage.php:157
+#: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Menu.php:100
 #: ../../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:665
+#: ../../Zotlabs/Module/Mitem.php:233 ../../Zotlabs/Module/Photos.php:666
 #: ../../Zotlabs/Module/Profiles.php:651 ../../Zotlabs/Module/Removeme.php:64
-#: ../../Zotlabs/Module/Settings.php:579 ../../include/dir_fns.php:141
+#: ../../Zotlabs/Module/Settings.php:581 ../../include/dir_fns.php:141
 #: ../../include/dir_fns.php:142 ../../include/dir_fns.php:143
 #: ../../view/theme/redbasic/php/config.php:105
-#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1606
+#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1619
 msgid "Yes"
 msgstr "Ja"
 
-#: ../../Zotlabs/Module/Admin.php:438
+#: ../../Zotlabs/Module/Admin.php:466
 msgid "My site is not a public server"
 msgstr "Mein Server ist kein öffentlicher Server"
 
-#: ../../Zotlabs/Module/Admin.php:439
+#: ../../Zotlabs/Module/Admin.php:467
 msgid "My site has paid access only"
 msgstr "Meine Seite hat nur bezahlten Zugriff"
 
-#: ../../Zotlabs/Module/Admin.php:440
+#: ../../Zotlabs/Module/Admin.php:468
 msgid "My site has free access only"
 msgstr "Meine Seite hat nur freien Zugriff"
 
-#: ../../Zotlabs/Module/Admin.php:441
+#: ../../Zotlabs/Module/Admin.php:469
 msgid "My site offers free accounts with optional paid upgrades"
 msgstr "Mein Server bietet kostenlose Konten mit der Möglichkeit zu bezahlten Upgrades"
 
-#: ../../Zotlabs/Module/Admin.php:463 ../../include/widgets.php:1334
+#: ../../Zotlabs/Module/Admin.php:491 ../../include/widgets.php:1383
 msgid "Site"
 msgstr "Seite"
 
-#: ../../Zotlabs/Module/Admin.php:464 ../../Zotlabs/Module/Admin.php:654
-#: ../../Zotlabs/Module/Admin.php:729 ../../Zotlabs/Module/Admin.php:994
-#: ../../Zotlabs/Module/Admin.php:1158 ../../Zotlabs/Module/Admin.php:1334
-#: ../../Zotlabs/Module/Admin.php:1529 ../../Zotlabs/Module/Admin.php:1614
-#: ../../Zotlabs/Module/Admin.php:1778 ../../Zotlabs/Module/Appman.php:103
+#: ../../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:1628 ../../Zotlabs/Module/Admin.php:1713
+#: ../../Zotlabs/Module/Admin.php:2078 ../../Zotlabs/Module/Appman.php:125
 #: ../../Zotlabs/Module/Cal.php:341 ../../Zotlabs/Module/Chat.php:194
 #: ../../Zotlabs/Module/Chat.php:236 ../../Zotlabs/Module/Connect.php:97
-#: ../../Zotlabs/Module/Connedit.php:733 ../../Zotlabs/Module/Events.php:472
-#: ../../Zotlabs/Module/Events.php:669
-#: ../../Zotlabs/Module/Filestorage.php:160
+#: ../../Zotlabs/Module/Connedit.php:734 ../../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/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/Mood.php:139 ../../Zotlabs/Module/Pconfig.php:107
-#: ../../Zotlabs/Module/Pdledit.php:66 ../../Zotlabs/Module/Photos.php:676
-#: ../../Zotlabs/Module/Photos.php:1051 ../../Zotlabs/Module/Photos.php:1091
-#: ../../Zotlabs/Module/Photos.php:1209 ../../Zotlabs/Module/Poke.php:186
+#: ../../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:172
-#: ../../Zotlabs/Module/Settings.php:588 ../../Zotlabs/Module/Settings.php:701
-#: ../../Zotlabs/Module/Settings.php:729 ../../Zotlabs/Module/Settings.php:752
-#: ../../Zotlabs/Module/Settings.php:840
-#: ../../Zotlabs/Module/Settings.php:1032 ../../Zotlabs/Module/Setup.php:335
-#: ../../Zotlabs/Module/Setup.php:376 ../../Zotlabs/Module/Sources.php:108
-#: ../../Zotlabs/Module/Sources.php:142 ../../Zotlabs/Module/Thing.php:316
+#: ../../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/Sources.php:149 ../../Zotlabs/Module/Thing.php:316
 #: ../../Zotlabs/Module/Thing.php:362 ../../Zotlabs/Module/Xchan.php:15
-#: ../../include/ItemObject.php:703 ../../include/widgets.php:708
-#: ../../include/widgets.php:720 ../../include/js_strings.php:22
+#: ../../include/widgets.php:757 ../../include/widgets.php:769
+#: ../../include/ItemObject.php:703 ../../include/js_strings.php:22
 #: ../../view/theme/redbasic/php/config.php:99
 msgid "Submit"
 msgstr "Bestätigen"
 
-#: ../../Zotlabs/Module/Admin.php:465 ../../Zotlabs/Module/Register.php:245
+#: ../../Zotlabs/Module/Admin.php:493 ../../Zotlabs/Module/Register.php:245
 msgid "Registration"
 msgstr "Registrierung"
 
-#: ../../Zotlabs/Module/Admin.php:466
+#: ../../Zotlabs/Module/Admin.php:494
 msgid "File upload"
 msgstr "Dateiupload"
 
-#: ../../Zotlabs/Module/Admin.php:467
+#: ../../Zotlabs/Module/Admin.php:495
 msgid "Policies"
 msgstr "Richtlinien"
 
-#: ../../Zotlabs/Module/Admin.php:468 ../../include/contact_widgets.php:19
+#: ../../Zotlabs/Module/Admin.php:496 ../../include/contact_widgets.php:19
 msgid "Advanced"
 msgstr "Fortgeschritten"
 
-#: ../../Zotlabs/Module/Admin.php:472
+#: ../../Zotlabs/Module/Admin.php:500
 msgid "Site name"
 msgstr "Seitenname"
 
-#: ../../Zotlabs/Module/Admin.php:473
+#: ../../Zotlabs/Module/Admin.php:501
 msgid "Banner/Logo"
 msgstr "Banner/Logo"
 
-#: ../../Zotlabs/Module/Admin.php:474
+#: ../../Zotlabs/Module/Admin.php:502
 msgid "Administrator Information"
 msgstr "Administrator-Informationen"
 
-#: ../../Zotlabs/Module/Admin.php:474
+#: ../../Zotlabs/Module/Admin.php:502
 msgid ""
 "Contact information for site administrators.  Displayed on siteinfo page.  "
 "BBCode can be used here"
 msgstr "Kontaktinformationen für Administratoren des Servers. Wird auf der siteinfo-Seite angezeigt. BBCode kann verwendet werden."
 
-#: ../../Zotlabs/Module/Admin.php:475
+#: ../../Zotlabs/Module/Admin.php:503
 msgid "System language"
 msgstr "System-Sprache"
 
-#: ../../Zotlabs/Module/Admin.php:476
+#: ../../Zotlabs/Module/Admin.php:504
 msgid "System theme"
 msgstr "System-Theme"
 
-#: ../../Zotlabs/Module/Admin.php:476
+#: ../../Zotlabs/Module/Admin.php:504
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr "Standard-System-Theme – kann durch Nutzerprofile überschieben werden – <a href='#' id='cnftheme'>Theme-Einstellungen ändern</a>"
 
-#: ../../Zotlabs/Module/Admin.php:477
+#: ../../Zotlabs/Module/Admin.php:505
 msgid "Mobile system theme"
 msgstr "Mobile System-Theme:"
 
-#: ../../Zotlabs/Module/Admin.php:477
+#: ../../Zotlabs/Module/Admin.php:505
 msgid "Theme for mobile devices"
 msgstr "Theme für mobile Geräte"
 
-#: ../../Zotlabs/Module/Admin.php:479
+#: ../../Zotlabs/Module/Admin.php:507
 msgid "Allow Feeds as Connections"
 msgstr "Feeds als Verbindungen erlauben"
 
-#: ../../Zotlabs/Module/Admin.php:479
+#: ../../Zotlabs/Module/Admin.php:507
 msgid "(Heavy system resource usage)"
 msgstr "(führt zu hoher Systemlast)"
 
-#: ../../Zotlabs/Module/Admin.php:480
+#: ../../Zotlabs/Module/Admin.php:508
 msgid "Maximum image size"
 msgstr "Maximale Bildgröße"
 
-#: ../../Zotlabs/Module/Admin.php:480
+#: ../../Zotlabs/Module/Admin.php:508
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr "Maximale Größe hochgeladener Bilder in Bytes. Standard ist 0 (keine Einschränkung)."
 
-#: ../../Zotlabs/Module/Admin.php:481
+#: ../../Zotlabs/Module/Admin.php:509
 msgid "Does this site allow new member registration?"
 msgstr "Erlaubt dieser Server die Registrierung neuer Nutzer?"
 
-#: ../../Zotlabs/Module/Admin.php:482
+#: ../../Zotlabs/Module/Admin.php:510
 msgid "Invitation only"
 msgstr "Nur mit Einladung"
 
-#: ../../Zotlabs/Module/Admin.php:482
+#: ../../Zotlabs/Module/Admin.php:510
 msgid ""
 "Only allow new member registrations with an invitation code. Above register "
 "policy must be set to Yes."
 msgstr "Erlaube die Neuregistrierung von Mitglieder nur mit einem Einladungscode. Die Registrierungs-Politik muss oben auf Ja gesetzt werden."
 
-#: ../../Zotlabs/Module/Admin.php:483
+#: ../../Zotlabs/Module/Admin.php:511
 msgid "Which best describes the types of account offered by this hub?"
 msgstr "Was ist die passendste Beschreibung der Konten auf diesem Hub?"
 
-#: ../../Zotlabs/Module/Admin.php:484
+#: ../../Zotlabs/Module/Admin.php:512
 msgid "Register text"
 msgstr "Registrierungstext"
 
-#: ../../Zotlabs/Module/Admin.php:484
+#: ../../Zotlabs/Module/Admin.php:512
 msgid "Will be displayed prominently on the registration page."
 msgstr "Wird gut sichtbar auf der Registrierungs-Seite angezeigt."
 
-#: ../../Zotlabs/Module/Admin.php:485
+#: ../../Zotlabs/Module/Admin.php:513
 msgid "Site homepage to show visitors (default: login box)"
 msgstr "Homepage des Hubs, die Besuchern angezeigt wird (Voreinstellung: Anmeldemaske)"
 
-#: ../../Zotlabs/Module/Admin.php:485
+#: ../../Zotlabs/Module/Admin.php:513
 msgid ""
 "example: 'public' to show public stream, 'page/sys/home' to show a system "
 "webpage called 'home' or 'include:home.html' to include a file."
 msgstr "Beispiele: 'public', um den Stream aller öffentlichen Beiträge anzuzeigen, 'page/sys/home', um eine System-Webseite namens 'home' anzuzeigen, 'include:home.html', um eine Datei einzufügen."
 
-#: ../../Zotlabs/Module/Admin.php:486
+#: ../../Zotlabs/Module/Admin.php:514
 msgid "Preserve site homepage URL"
 msgstr "Homepage-URL schützen"
 
-#: ../../Zotlabs/Module/Admin.php:486
+#: ../../Zotlabs/Module/Admin.php:514
 msgid ""
 "Present the site homepage in a frame at the original location instead of "
 "redirecting"
 msgstr "Zeigt die Homepage an der Original-URL in einem Frame an, statt auf die eigentliche Adresse der Seite umzuleiten."
 
-#: ../../Zotlabs/Module/Admin.php:487
+#: ../../Zotlabs/Module/Admin.php:515
 msgid "Accounts abandoned after x days"
 msgstr "Konten gelten nach X Tagen als unbenutzt"
 
-#: ../../Zotlabs/Module/Admin.php:487
+#: ../../Zotlabs/Module/Admin.php:515
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr "Verschwende keine Systemressourcen auf das Pollen von externen Seiten, wenn das Konto nicht mehr benutzt wird. Trage hier 0 für kein zeitliches Limit."
 
-#: ../../Zotlabs/Module/Admin.php:488
+#: ../../Zotlabs/Module/Admin.php:516
 msgid "Allowed friend domains"
 msgstr "Erlaubte Domains für Kontakte"
 
-#: ../../Zotlabs/Module/Admin.php:488
+#: ../../Zotlabs/Module/Admin.php:516
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr "Liste der Domains, die für Freundschaften erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."
 
-#: ../../Zotlabs/Module/Admin.php:489
+#: ../../Zotlabs/Module/Admin.php:517
 msgid "Allowed email domains"
 msgstr "Erlaubte Domains für E-Mails"
 
-#: ../../Zotlabs/Module/Admin.php:489
+#: ../../Zotlabs/Module/Admin.php:517
 msgid ""
 "Comma separated list of domains which are allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains"
 msgstr "Liste der Domains, die für E-Mail-Adressen bei der Registrierung erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."
 
-#: ../../Zotlabs/Module/Admin.php:490
+#: ../../Zotlabs/Module/Admin.php:518
 msgid "Not allowed email domains"
 msgstr "Nicht erlaubte Domains für E-Mails"
 
-#: ../../Zotlabs/Module/Admin.php:490
+#: ../../Zotlabs/Module/Admin.php:518
 msgid ""
 "Comma separated list of domains which are not allowed in email addresses for"
 " registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains, unless allowed domains have been defined."
 msgstr "Domains in E-Mail-Adressen, die keine Erlaubnis erhalten, sich auf Deinem Hub zu registrieren. Mehrere Domains können durch Kommas getrennt werden. Platzhalter (*/?) sind möglich. Keine Eingabe bedeutet keine Einschränkung, unabhängig davon, ob unter erlaubte Domains etwas eingegeben wurde."
 
-#: ../../Zotlabs/Module/Admin.php:491
+#: ../../Zotlabs/Module/Admin.php:519
 msgid "Verify Email Addresses"
 msgstr "E-Mail-Adressen überprüfen"
 
-#: ../../Zotlabs/Module/Admin.php:491
+#: ../../Zotlabs/Module/Admin.php:519
 msgid ""
 "Check to verify email addresses used in account registration (recommended)."
 msgstr "Aktivieren, um die Überprüfung von E-Mail-Adressen bei der Registrierung von Benutzerkonten zu aktivieren (empfohlen)."
 
-#: ../../Zotlabs/Module/Admin.php:492
+#: ../../Zotlabs/Module/Admin.php:520
 msgid "Force publish"
 msgstr "Veröffentlichung erzwingen"
 
-#: ../../Zotlabs/Module/Admin.php:492
+#: ../../Zotlabs/Module/Admin.php:520
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr "Die Veröffentlichung aller Profile dieses Servers im Verzeichnis erzwingen."
 
-#: ../../Zotlabs/Module/Admin.php:493
+#: ../../Zotlabs/Module/Admin.php:521
 msgid "Import Public Streams"
 msgstr "Öffentliche Beiträge importieren"
 
-#: ../../Zotlabs/Module/Admin.php:493
+#: ../../Zotlabs/Module/Admin.php:521
 msgid ""
 "Import and allow access to public content pulled from other sites. Warning: "
 "this content is unmoderated."
 msgstr "Öffentliche Beiträge von anderen Servern importieren und zur Verfügung stellen. Warnung: Diese Inhalte sind nicht moderiert."
 
-#: ../../Zotlabs/Module/Admin.php:494
+#: ../../Zotlabs/Module/Admin.php:522
 msgid "Login on Homepage"
 msgstr "Log-in auf der Startseite"
 
-#: ../../Zotlabs/Module/Admin.php:494
+#: ../../Zotlabs/Module/Admin.php:522
 msgid ""
 "Present a login box to visitors on the home page if no other content has "
 "been configured."
 msgstr "Zeigt Besuchern der Homepage eine Anmeldemaske, falls keine anderen Inhalte konfiguriert wurden."
 
-#: ../../Zotlabs/Module/Admin.php:495
+#: ../../Zotlabs/Module/Admin.php:523
 msgid "Enable context help"
 msgstr "Kontext-Hilfe aktivieren"
 
-#: ../../Zotlabs/Module/Admin.php:495
+#: ../../Zotlabs/Module/Admin.php:523
 msgid ""
 "Display contextual help for the current page when the help button is "
 "pressed."
 msgstr "Zeigt Kontext-sensitive Hilfe für die aktuelle Seite an, wenn der Hilfe-Knopf geklickt wird."
 
-#: ../../Zotlabs/Module/Admin.php:497
+#: ../../Zotlabs/Module/Admin.php:525
 msgid "Directory Server URL"
 msgstr "Verzeichnisserver-URL"
 
-#: ../../Zotlabs/Module/Admin.php:497
+#: ../../Zotlabs/Module/Admin.php:525
 msgid "Default directory server"
 msgstr "Standard-Verzeichnisserver"
 
-#: ../../Zotlabs/Module/Admin.php:499
+#: ../../Zotlabs/Module/Admin.php:527
 msgid "Proxy user"
 msgstr "Proxy Benutzer"
 
-#: ../../Zotlabs/Module/Admin.php:500
+#: ../../Zotlabs/Module/Admin.php:528
 msgid "Proxy URL"
 msgstr "Proxy URL"
 
-#: ../../Zotlabs/Module/Admin.php:501
+#: ../../Zotlabs/Module/Admin.php:529
 msgid "Network timeout"
 msgstr "Netzwerk-Timeout"
 
-#: ../../Zotlabs/Module/Admin.php:501
+#: ../../Zotlabs/Module/Admin.php:529
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr "Wert in Sekunden. 0 für unbegrenzt (nicht empfohlen)."
 
-#: ../../Zotlabs/Module/Admin.php:502
+#: ../../Zotlabs/Module/Admin.php:530
 msgid "Delivery interval"
 msgstr "Auslieferung Intervall"
 
-#: ../../Zotlabs/Module/Admin.php:502
+#: ../../Zotlabs/Module/Admin.php:530
 msgid ""
 "Delay background delivery processes by this many seconds to reduce system "
 "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
 "for large dedicated servers."
 msgstr "Verzögere im Hintergrund laufende Auslieferungsprozesse um die angegebene Anzahl Sekunden, um die Systemlast zu verringern. Empfehlungen: 4-5 für Shared Hosts, 2-3 für VPS, 0-1 für große dedizierte Server."
 
-#: ../../Zotlabs/Module/Admin.php:503
+#: ../../Zotlabs/Module/Admin.php:531
 msgid "Deliveries per process"
 msgstr "Zustellungen pro Prozess"
 
-#: ../../Zotlabs/Module/Admin.php:503
+#: ../../Zotlabs/Module/Admin.php:531
 msgid ""
 "Number of deliveries to attempt in a single operating system process. Adjust"
 " if necessary to tune system performance. Recommend: 1-5."
 msgstr "Anzahl der Zustellungen, die innerhalb eines einzelnen Betriebssystemprozesses versucht werden. Anpassen, falls nötig, um die System-Performance zu verbessern. Empfehlung: 1-5."
 
-#: ../../Zotlabs/Module/Admin.php:504
+#: ../../Zotlabs/Module/Admin.php:532
 msgid "Poll interval"
 msgstr "Abfrageintervall"
 
-#: ../../Zotlabs/Module/Admin.php:504
+#: ../../Zotlabs/Module/Admin.php:532
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr "Verzögere Hintergrundprozesse um diese Anzahl Sekunden, um die Systemlast zu reduzieren. Bei 0 wird das Auslieferungsintervall verwendet."
 
-#: ../../Zotlabs/Module/Admin.php:505
+#: ../../Zotlabs/Module/Admin.php:533
 msgid "Maximum Load Average"
 msgstr "Maximales Load Average"
 
-#: ../../Zotlabs/Module/Admin.php:505
+#: ../../Zotlabs/Module/Admin.php:533
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr "Maximale Systemlast, bevor Verteil- und Empfangsprozesse verschoben werden – Standard 50"
 
-#: ../../Zotlabs/Module/Admin.php:506
+#: ../../Zotlabs/Module/Admin.php:534
 msgid "Expiration period in days for imported (grid/network) content"
 msgstr "Setze den Zeitraum (in Tagen), ab wann importierte (aus dem Netzwerk) Inhalte ablaufen sollen"
 
-#: ../../Zotlabs/Module/Admin.php:506
+#: ../../Zotlabs/Module/Admin.php:534
 msgid "0 for no expiration of imported content"
 msgstr "0 = keine Löschung importierter Inhalte"
 
-#: ../../Zotlabs/Module/Admin.php:643 ../../Zotlabs/Module/Admin.php:644
-#: ../../Zotlabs/Module/Settings.php:720
+#: ../../Zotlabs/Module/Admin.php:677 ../../Zotlabs/Module/Admin.php:678
+#: ../../Zotlabs/Module/Settings.php:722
 msgid "Off"
 msgstr "Aus"
 
-#: ../../Zotlabs/Module/Admin.php:643 ../../Zotlabs/Module/Admin.php:644
-#: ../../Zotlabs/Module/Settings.php:720
+#: ../../Zotlabs/Module/Admin.php:677 ../../Zotlabs/Module/Admin.php:678
+#: ../../Zotlabs/Module/Settings.php:722
 msgid "On"
 msgstr "An"
 
-#: ../../Zotlabs/Module/Admin.php:644
+#: ../../Zotlabs/Module/Admin.php:678
 #, php-format
 msgid "Lock feature %s"
 msgstr "Blockiere die Funktion %s"
 
-#: ../../Zotlabs/Module/Admin.php:652
+#: ../../Zotlabs/Module/Admin.php:686
 msgid "Manage Additional Features"
 msgstr "Zusätzliche Funktionen verwalten"
 
-#: ../../Zotlabs/Module/Admin.php:669
+#: ../../Zotlabs/Module/Admin.php:703
 msgid "No server found"
 msgstr "Kein Server gefunden"
 
-#: ../../Zotlabs/Module/Admin.php:676 ../../Zotlabs/Module/Admin.php:1006
+#: ../../Zotlabs/Module/Admin.php:710 ../../Zotlabs/Module/Admin.php:1048
 msgid "ID"
 msgstr "ID"
 
-#: ../../Zotlabs/Module/Admin.php:676
+#: ../../Zotlabs/Module/Admin.php:710
 msgid "for channel"
 msgstr "für Kanal"
 
-#: ../../Zotlabs/Module/Admin.php:676
+#: ../../Zotlabs/Module/Admin.php:710
 msgid "on server"
 msgstr "auf Server"
 
-#: ../../Zotlabs/Module/Admin.php:676 ../../Zotlabs/Module/Connections.php:270
+#: ../../Zotlabs/Module/Admin.php:710 ../../Zotlabs/Module/Connections.php:270
 msgid "Status"
 msgstr "Status"
 
-#: ../../Zotlabs/Module/Admin.php:678
+#: ../../Zotlabs/Module/Admin.php:712
 msgid "Server"
 msgstr "Server"
 
-#: ../../Zotlabs/Module/Admin.php:718 ../../include/widgets.php:1337
+#: ../../Zotlabs/Module/Admin.php:746
+msgid ""
+"By default, unfiltered HTML is allowed in embedded media. This is inherently"
+" insecure."
+msgstr "Standardmäßig wird ungefiltertes HTML in eingebetteten Inhalten zugelassen. Das ist prinzipiell unsicher."
+
+#: ../../Zotlabs/Module/Admin.php:749
+msgid ""
+"The recommended setting is to only allow unfiltered HTML from the following "
+"sites:"
+msgstr "Die empfohlene Einstellung ist, ungefiltertes HTML nur von den nachfolgenden Webseiten zu erlauben:"
+
+#: ../../Zotlabs/Module/Admin.php:750
+msgid ""
+"https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/<br"
+" />https://vimeo.com/<br />https://soundcloud.com/<br />"
+msgstr "https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/<br />https://vimeo.com/<br />https://soundcloud.com/<br />"
+
+#: ../../Zotlabs/Module/Admin.php:751
+msgid ""
+"All other embedded content will be filtered, <strong>unless</strong> "
+"embedded content from that site is explicitly blocked."
+msgstr "Alle anderen eingebetteten Inhalte werden gefiltert, <strong>es sei denn</strong>, eingebettete Inhalte von einer bestimmten Seite sind explizit blockiert."
+
+#: ../../Zotlabs/Module/Admin.php:756 ../../include/widgets.php:1386
 msgid "Security"
 msgstr "Sicherheit"
 
-#: ../../Zotlabs/Module/Admin.php:720
+#: ../../Zotlabs/Module/Admin.php:758
 msgid "Block public"
 msgstr "Öffentlichen Zugriff blockieren"
 
-#: ../../Zotlabs/Module/Admin.php:720
+#: ../../Zotlabs/Module/Admin.php:758
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently authenticated."
 msgstr "Blockiere den öffentlichen Zugriff auf alle ansonsten öffentlichen persönlichen Seiten dieser Website, sofern ein Besucher nicht angemeldet ist."
 
-#: ../../Zotlabs/Module/Admin.php:721
+#: ../../Zotlabs/Module/Admin.php:759
+msgid "Set \"Transport Security\" HTTP header"
+msgstr "Setze den \"Transport Security\" HTTP Header"
+
+#: ../../Zotlabs/Module/Admin.php:760
+msgid "Set \"Content Security Policy\" HTTP header"
+msgstr "Setze den \"Content Security Policy\" HTTP Header"
+
+#: ../../Zotlabs/Module/Admin.php:761
 msgid "Allow communications only from these sites"
 msgstr "Kommunikation nur von diesen Seiten erlauben"
 
-#: ../../Zotlabs/Module/Admin.php:721
+#: ../../Zotlabs/Module/Admin.php:761
 msgid ""
 "One site per line. Leave empty to allow communication from anywhere by "
 "default"
 msgstr "Ein Eintrag pro Zeile. Lasse das Feld leer, um Kommunikation grundlegend von überall her zu erlauben."
 
-#: ../../Zotlabs/Module/Admin.php:722
+#: ../../Zotlabs/Module/Admin.php:762
 msgid "Block communications from these sites"
 msgstr "Kommunikation von diesen Seiten blockieren"
 
-#: ../../Zotlabs/Module/Admin.php:723
+#: ../../Zotlabs/Module/Admin.php:763
 msgid "Allow communications only from these channels"
 msgstr "Kommunikation nur von diesen Kanälen erlauben"
 
-#: ../../Zotlabs/Module/Admin.php:723
+#: ../../Zotlabs/Module/Admin.php:763
 msgid ""
 "One channel (hash) per line. Leave empty to allow from any channel by "
 "default"
 msgstr "Ein Kanal (hash) pro Zeile. Leerlassen um jeden Kanal zuzulassen. "
 
-#: ../../Zotlabs/Module/Admin.php:724
+#: ../../Zotlabs/Module/Admin.php:764
 msgid "Block communications from these channels"
 msgstr "Kommunikation von folgenden Kanälen blockieren"
 
-#: ../../Zotlabs/Module/Admin.php:725
-msgid "Allow embedded HTML content only from these domains"
-msgstr "Eingebetteten HTML Inhalt von folgenden Domains erlauben"
+#: ../../Zotlabs/Module/Admin.php:765
+msgid "Only allow embeds from secure (SSL) websites and links."
+msgstr "Erlaube Einbettungen nur von sicheren (SSL) Webseiten und Links."
 
-#: ../../Zotlabs/Module/Admin.php:725
-msgid "One site per line. Leave empty to allow from any site by default"
-msgstr "Eine Seite pro Zeile. Leerlassen um von jeder Seite zuzulassen. "
+#: ../../Zotlabs/Module/Admin.php:766
+msgid "Allow unfiltered embedded HTML content only from these domains"
+msgstr "Erlaube Einbettung von Inhalten mit ungefiltertem HTML nur von diesen Domains"
 
-#: ../../Zotlabs/Module/Admin.php:726
+#: ../../Zotlabs/Module/Admin.php:766
+msgid "One site per line. By default embedded content is filtered."
+msgstr "Eine Website/Domain pro Zeile. Standardmäßig wird eingebetteter Inhalt gefiltert."
+
+#: ../../Zotlabs/Module/Admin.php:767
 msgid "Block embedded HTML from these domains"
 msgstr "Eingebettete HTML Inhalte von diesen Seiten blockieren"
 
-#: ../../Zotlabs/Module/Admin.php:728
-msgid "Cooperative embed security"
-msgstr "Kooperative Einbettungssicherheit"
-
-#: ../../Zotlabs/Module/Admin.php:728
-msgid "Enable to share embed security with other compatible sites/hubs"
-msgstr "Teile die Einbettungssicherheit mit anderen kompatiblen Websites/Hubs."
-
-#: ../../Zotlabs/Module/Admin.php:743
+#: ../../Zotlabs/Module/Admin.php:785
 msgid "Update has been marked successful"
 msgstr "Update wurde als erfolgreich markiert"
 
-#: ../../Zotlabs/Module/Admin.php:753
+#: ../../Zotlabs/Module/Admin.php:795
 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr "Ausführen von %s fehlgeschlagen. Überprüfe die Systemprotokolle."
 
-#: ../../Zotlabs/Module/Admin.php:756
+#: ../../Zotlabs/Module/Admin.php:798
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr "Update %s wurde erfolgreich ausgeführt."
 
-#: ../../Zotlabs/Module/Admin.php:760
+#: ../../Zotlabs/Module/Admin.php:802
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr "Update %s lieferte keinen Rückgabewert. Erfolg unbekannt."
 
-#: ../../Zotlabs/Module/Admin.php:763
+#: ../../Zotlabs/Module/Admin.php:805
 #, php-format
 msgid "Update function %s could not be found."
 msgstr "Update-Funktion %s konnte nicht gefunden werden."
 
-#: ../../Zotlabs/Module/Admin.php:779
+#: ../../Zotlabs/Module/Admin.php:821
 msgid "No failed updates."
 msgstr "Keine fehlgeschlagenen Aktualisierungen."
 
-#: ../../Zotlabs/Module/Admin.php:783
+#: ../../Zotlabs/Module/Admin.php:825
 msgid "Failed Updates"
 msgstr "Fehlgeschlagene Aktualisierungen"
 
-#: ../../Zotlabs/Module/Admin.php:785
+#: ../../Zotlabs/Module/Admin.php:827
 msgid "Mark success (if update was manually applied)"
 msgstr "Als erfolgreich markieren (wenn das Update manuell ausgeführt wurde)"
 
-#: ../../Zotlabs/Module/Admin.php:786
+#: ../../Zotlabs/Module/Admin.php:828
 msgid "Attempt to execute this update step automatically"
 msgstr "Versuche, diesen Updateschritt automatisch auszuführen"
 
-#: ../../Zotlabs/Module/Admin.php:817
+#: ../../Zotlabs/Module/Admin.php:859
 msgid "Queue Statistics"
 msgstr "Warteschlangenstatistiken"
 
-#: ../../Zotlabs/Module/Admin.php:818
+#: ../../Zotlabs/Module/Admin.php:860
 msgid "Total Entries"
 msgstr "Einträge insgesamt"
 
-#: ../../Zotlabs/Module/Admin.php:819
+#: ../../Zotlabs/Module/Admin.php:861
 msgid "Priority"
 msgstr "Priorität"
 
-#: ../../Zotlabs/Module/Admin.php:820
+#: ../../Zotlabs/Module/Admin.php:862
 msgid "Destination URL"
 msgstr "Ziel-URL"
 
-#: ../../Zotlabs/Module/Admin.php:821
+#: ../../Zotlabs/Module/Admin.php:863
 msgid "Mark hub permanently offline"
 msgstr "Hub als permanent offline markieren"
 
-#: ../../Zotlabs/Module/Admin.php:822
+#: ../../Zotlabs/Module/Admin.php:864
 msgid "Empty queue for this hub"
 msgstr "Warteschlange für diesen Hub leeren"
 
-#: ../../Zotlabs/Module/Admin.php:823
+#: ../../Zotlabs/Module/Admin.php:865
 msgid "Last known contact"
 msgstr "Letzter Kontakt"
 
-#: ../../Zotlabs/Module/Admin.php:859
+#: ../../Zotlabs/Module/Admin.php:901
 #, php-format
 msgid "%s account blocked/unblocked"
 msgid_plural "%s account blocked/unblocked"
 msgstr[0] "%s Konto blockiert/freigegeben"
 msgstr[1] "%s Konten blockiert/freigegeben"
 
-#: ../../Zotlabs/Module/Admin.php:867
+#: ../../Zotlabs/Module/Admin.php:909
 #, php-format
 msgid "%s account deleted"
 msgid_plural "%s accounts deleted"
 msgstr[0] "%s Konto gelöscht"
 msgstr[1] "%s Konten gelöscht"
 
-#: ../../Zotlabs/Module/Admin.php:903
+#: ../../Zotlabs/Module/Admin.php:945
 msgid "Account not found"
 msgstr "Konto nicht gefunden"
 
-#: ../../Zotlabs/Module/Admin.php:915
+#: ../../Zotlabs/Module/Admin.php:957
 #, php-format
 msgid "Account '%s' deleted"
 msgstr "Konto '%s' gelöscht"
 
-#: ../../Zotlabs/Module/Admin.php:923
+#: ../../Zotlabs/Module/Admin.php:965
 #, php-format
 msgid "Account '%s' blocked"
 msgstr "Konto '%s' blockiert"
 
-#: ../../Zotlabs/Module/Admin.php:931
+#: ../../Zotlabs/Module/Admin.php:973
 #, php-format
 msgid "Account '%s' unblocked"
 msgstr "Konto '%s' freigegeben"
 
-#: ../../Zotlabs/Module/Admin.php:993 ../../Zotlabs/Module/Admin.php:1005
+#: ../../Zotlabs/Module/Admin.php:1035 ../../Zotlabs/Module/Admin.php:1047
 msgid "Users"
 msgstr "Benutzer"
 
-#: ../../Zotlabs/Module/Admin.php:995 ../../Zotlabs/Module/Admin.php:1159
+#: ../../Zotlabs/Module/Admin.php:1037 ../../Zotlabs/Module/Admin.php:1201
 msgid "select all"
 msgstr "Alle auswählen"
 
-#: ../../Zotlabs/Module/Admin.php:996
+#: ../../Zotlabs/Module/Admin.php:1038
 msgid "User registrations waiting for confirm"
 msgstr "Neuanmeldungen, die auf Deine Bestätigung warten"
 
-#: ../../Zotlabs/Module/Admin.php:997
+#: ../../Zotlabs/Module/Admin.php:1039
 msgid "Request date"
 msgstr "Antragsdatum"
 
-#: ../../Zotlabs/Module/Admin.php:997 ../../Zotlabs/Module/Admin.php:1006
+#: ../../Zotlabs/Module/Admin.php:1039 ../../Zotlabs/Module/Admin.php:1048
 #: ../../Zotlabs/Module/Id.php:17 ../../Zotlabs/Module/Id.php:18
-#: ../../include/contact_selectors.php:81 ../../boot.php:1604
+#: ../../include/contact_selectors.php:81 ../../boot.php:1617
 msgid "Email"
 msgstr "E-Mail"
 
-#: ../../Zotlabs/Module/Admin.php:998
+#: ../../Zotlabs/Module/Admin.php:1040
 msgid "No registrations."
 msgstr "Keine Registrierungen."
 
-#: ../../Zotlabs/Module/Admin.php:999 ../../Zotlabs/Module/Connections.php:275
+#: ../../Zotlabs/Module/Admin.php:1041
+#: ../../Zotlabs/Module/Connections.php:275
 msgid "Approve"
 msgstr "Genehmigen"
 
-#: ../../Zotlabs/Module/Admin.php:1000
+#: ../../Zotlabs/Module/Admin.php:1042
 msgid "Deny"
 msgstr "Verweigern"
 
-#: ../../Zotlabs/Module/Admin.php:1002 ../../Zotlabs/Module/Connedit.php:541
+#: ../../Zotlabs/Module/Admin.php:1044 ../../Zotlabs/Module/Connedit.php:541
 msgid "Block"
 msgstr "Blockieren"
 
-#: ../../Zotlabs/Module/Admin.php:1003 ../../Zotlabs/Module/Connedit.php:541
+#: ../../Zotlabs/Module/Admin.php:1045 ../../Zotlabs/Module/Connedit.php:541
 msgid "Unblock"
 msgstr "Freigeben"
 
-#: ../../Zotlabs/Module/Admin.php:1006 ../../include/group.php:267
+#: ../../Zotlabs/Module/Admin.php:1048 ../../include/group.php:267
 msgid "All Channels"
 msgstr "Alle Kanäle"
 
-#: ../../Zotlabs/Module/Admin.php:1006
+#: ../../Zotlabs/Module/Admin.php:1048
 msgid "Register date"
 msgstr "Registrierungs-Datum"
 
-#: ../../Zotlabs/Module/Admin.php:1006
+#: ../../Zotlabs/Module/Admin.php:1048
 msgid "Last login"
 msgstr "Letzte Anmeldung"
 
-#: ../../Zotlabs/Module/Admin.php:1006
+#: ../../Zotlabs/Module/Admin.php:1048
 msgid "Expires"
 msgstr "Verfällt"
 
-#: ../../Zotlabs/Module/Admin.php:1006
+#: ../../Zotlabs/Module/Admin.php:1048
 msgid "Service Class"
 msgstr "Service-Klasse"
 
-#: ../../Zotlabs/Module/Admin.php:1008
+#: ../../Zotlabs/Module/Admin.php:1050
 msgid ""
 "Selected accounts will be deleted!\\n\\nEverything these accounts had posted"
 " on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Die ausgewählten Konten werden gelöscht!\\n\\nAlles, was diese Konten auf diesem Hub veröffentlicht haben, wird endgültig gelöscht werden!\\n\\nBist du dir sicher?"
 
-#: ../../Zotlabs/Module/Admin.php:1009
+#: ../../Zotlabs/Module/Admin.php:1051
 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 "Das Konto {0} wird gelöscht!\\n\\nAlles, was dieses Konto auf diesem Hub veröffentlicht hat, wird endgültig gelöscht werden!\\n\\nBist Du sicher?"
 
-#: ../../Zotlabs/Module/Admin.php:1045
+#: ../../Zotlabs/Module/Admin.php:1087
 #, php-format
 msgid "%s channel censored/uncensored"
 msgid_plural "%s channels censored/uncensored"
 msgstr[0] "%s Kanal gesperrt/freigegeben"
 msgstr[1] "%s Kanäle gesperrt/freigegeben"
 
-#: ../../Zotlabs/Module/Admin.php:1054
+#: ../../Zotlabs/Module/Admin.php:1096
 #, php-format
 msgid "%s channel code allowed/disallowed"
 msgid_plural "%s channels code allowed/disallowed"
 msgstr[0] "Code für %s Kanal gesperrt/freigegeben"
 msgstr[1] "Code für %s Kanäle gesperrt/freigegeben"
 
-#: ../../Zotlabs/Module/Admin.php:1061
+#: ../../Zotlabs/Module/Admin.php:1103
 #, php-format
 msgid "%s channel deleted"
 msgid_plural "%s channels deleted"
 msgstr[0] "%s Kanal gelöscht"
 msgstr[1] "%s Kanäle gelöscht"
 
-#: ../../Zotlabs/Module/Admin.php:1081
+#: ../../Zotlabs/Module/Admin.php:1123
 msgid "Channel not found"
 msgstr "Kanal nicht gefunden"
 
-#: ../../Zotlabs/Module/Admin.php:1092
+#: ../../Zotlabs/Module/Admin.php:1134
 #, php-format
 msgid "Channel '%s' deleted"
 msgstr "Kanal '%s' gelöscht"
 
-#: ../../Zotlabs/Module/Admin.php:1104
+#: ../../Zotlabs/Module/Admin.php:1146
 #, php-format
 msgid "Channel '%s' censored"
 msgstr "Kanal '%s' gesperrt"
 
-#: ../../Zotlabs/Module/Admin.php:1104
+#: ../../Zotlabs/Module/Admin.php:1146
 #, php-format
 msgid "Channel '%s' uncensored"
 msgstr "Kanal '%s' freigegeben"
 
-#: ../../Zotlabs/Module/Admin.php:1115
+#: ../../Zotlabs/Module/Admin.php:1157
 #, php-format
 msgid "Channel '%s' code allowed"
 msgstr "Code für Kanal '%s' freigegeben"
 
-#: ../../Zotlabs/Module/Admin.php:1115
+#: ../../Zotlabs/Module/Admin.php:1157
 #, php-format
 msgid "Channel '%s' code disallowed"
 msgstr "Code für Kanal '%s' gesperrt"
 
-#: ../../Zotlabs/Module/Admin.php:1157 ../../include/widgets.php:1336
+#: ../../Zotlabs/Module/Admin.php:1199 ../../include/widgets.php:1385
 msgid "Channels"
 msgstr "Kanäle"
 
-#: ../../Zotlabs/Module/Admin.php:1161
+#: ../../Zotlabs/Module/Admin.php:1203
 msgid "Censor"
 msgstr "Sperren"
 
-#: ../../Zotlabs/Module/Admin.php:1162
+#: ../../Zotlabs/Module/Admin.php:1204
 msgid "Uncensor"
 msgstr "Freigeben"
 
-#: ../../Zotlabs/Module/Admin.php:1163
+#: ../../Zotlabs/Module/Admin.php:1205
 msgid "Allow Code"
 msgstr "Code erlauben"
 
-#: ../../Zotlabs/Module/Admin.php:1164
+#: ../../Zotlabs/Module/Admin.php:1206
 msgid "Disallow Code"
 msgstr "Code sperren"
 
-#: ../../Zotlabs/Module/Admin.php:1165 ../../include/conversation.php:1629
+#: ../../Zotlabs/Module/Admin.php:1207 ../../include/conversation.php:1617
 msgid "Channel"
 msgstr "Kanal"
 
-#: ../../Zotlabs/Module/Admin.php:1166
+#: ../../Zotlabs/Module/Admin.php:1208
 msgid "UID"
 msgstr "UID"
 
-#: ../../Zotlabs/Module/Admin.php:1166 ../../Zotlabs/Module/Locs.php:118
+#: ../../Zotlabs/Module/Admin.php:1208 ../../Zotlabs/Module/Locs.php:118
 #: ../../Zotlabs/Module/Profiles.php:469
 msgid "Address"
 msgstr "Adresse"
 
-#: ../../Zotlabs/Module/Admin.php:1168
+#: ../../Zotlabs/Module/Admin.php:1210
 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 "Alle ausgewählten Kanäle werden gelöscht!\\n\\nAlles was von diesen Kanälen auf diesem Server geschrieben wurde, wird dauerhaft gelöscht!\\n\\nBist Du sicher?"
 
-#: ../../Zotlabs/Module/Admin.php:1169
+#: ../../Zotlabs/Module/Admin.php:1211
 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 "Der Kanal {0} wird gelöscht!\\n\\nAlles was von diesem Kanal auf diesem Server geschrieben wurde, wird gelöscht!\\n\\nBist Du sicher?"
 
-#: ../../Zotlabs/Module/Admin.php:1226
+#: ../../Zotlabs/Module/Admin.php:1268
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "Plug-In %s deaktiviert."
 
-#: ../../Zotlabs/Module/Admin.php:1230
+#: ../../Zotlabs/Module/Admin.php:1272
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "Plug-In %s aktiviert."
 
-#: ../../Zotlabs/Module/Admin.php:1240 ../../Zotlabs/Module/Admin.php:1466
+#: ../../Zotlabs/Module/Admin.php:1282 ../../Zotlabs/Module/Admin.php:1565
 msgid "Disable"
 msgstr "Deaktivieren"
 
-#: ../../Zotlabs/Module/Admin.php:1243 ../../Zotlabs/Module/Admin.php:1468
+#: ../../Zotlabs/Module/Admin.php:1285 ../../Zotlabs/Module/Admin.php:1567
 msgid "Enable"
 msgstr "Aktivieren"
 
-#: ../../Zotlabs/Module/Admin.php:1272 ../../Zotlabs/Module/Admin.php:1333
-#: ../../include/widgets.php:1339
+#: ../../Zotlabs/Module/Admin.php:1314 ../../Zotlabs/Module/Admin.php:1404
+#: ../../include/widgets.php:1388
 msgid "Plugins"
 msgstr "Plug-Ins"
 
-#: ../../Zotlabs/Module/Admin.php:1273 ../../Zotlabs/Module/Admin.php:1495
+#: ../../Zotlabs/Module/Admin.php:1315 ../../Zotlabs/Module/Admin.php:1594
 msgid "Toggle"
 msgstr "Umschalten"
 
-#: ../../Zotlabs/Module/Admin.php:1274 ../../Zotlabs/Module/Admin.php:1496
-#: ../../include/apps.php:134 ../../include/widgets.php:589
-#: ../../include/nav.php:211
+#: ../../Zotlabs/Module/Admin.php:1316 ../../Zotlabs/Module/Admin.php:1595
+#: ../../include/widgets.php:638 ../../include/nav.php:208
+#: ../../include/apps.php:166
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: ../../Zotlabs/Module/Admin.php:1281 ../../Zotlabs/Module/Admin.php:1505
+#: ../../Zotlabs/Module/Admin.php:1323 ../../Zotlabs/Module/Admin.php:1604
 msgid "Author: "
 msgstr "Autor: "
 
-#: ../../Zotlabs/Module/Admin.php:1282 ../../Zotlabs/Module/Admin.php:1506
+#: ../../Zotlabs/Module/Admin.php:1324 ../../Zotlabs/Module/Admin.php:1605
 msgid "Maintainer: "
 msgstr "Betreuer:"
 
-#: ../../Zotlabs/Module/Admin.php:1283
+#: ../../Zotlabs/Module/Admin.php:1325
 msgid "Minimum project version: "
 msgstr "Minimale Version des Projekts:"
 
-#: ../../Zotlabs/Module/Admin.php:1284
+#: ../../Zotlabs/Module/Admin.php:1326
 msgid "Maximum project version: "
 msgstr "Maximale Version des Projekts:"
 
-#: ../../Zotlabs/Module/Admin.php:1285
+#: ../../Zotlabs/Module/Admin.php:1327
 msgid "Minimum PHP version: "
 msgstr "Minimale PHP Version:"
 
-#: ../../Zotlabs/Module/Admin.php:1286
+#: ../../Zotlabs/Module/Admin.php:1328
 msgid "Requires: "
 msgstr "Benötigt:"
 
-#: ../../Zotlabs/Module/Admin.php:1287 ../../Zotlabs/Module/Admin.php:1338
+#: ../../Zotlabs/Module/Admin.php:1329 ../../Zotlabs/Module/Admin.php:1409
 msgid "Disabled - version incompatibility"
 msgstr "Abgeschaltet - Versionsinkompatibilität"
 
-#: ../../Zotlabs/Module/Admin.php:1431
+#: ../../Zotlabs/Module/Admin.php:1378
+msgid "Enter the public git repository URL of the plugin repo."
+msgstr "Gib die öffentliche Git-Repository-URL des Plugin-Repository an."
+
+#: ../../Zotlabs/Module/Admin.php:1379
+msgid "Plugin repo git URL"
+msgstr "Plugin-Repository Git URL"
+
+#: ../../Zotlabs/Module/Admin.php:1380
+msgid "Custom repo name"
+msgstr "Benutzerdefinierter Repository-Name"
+
+#: ../../Zotlabs/Module/Admin.php:1380
+msgid "(optional)"
+msgstr "(optional)"
+
+#: ../../Zotlabs/Module/Admin.php:1381
+msgid "Download Plugin Repo"
+msgstr "Plugin-Repository herunterladen"
+
+#: ../../Zotlabs/Module/Admin.php:1388
+msgid "Install new repo"
+msgstr "Neues Repository installieren"
+
+#: ../../Zotlabs/Module/Admin.php:1389 ../../include/apps.php:284
+msgid "Install"
+msgstr "Installieren"
+
+#: ../../Zotlabs/Module/Admin.php:1390 ../../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
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: ../../Zotlabs/Module/Admin.php:1411
+msgid "Add Plugin Repo"
+msgstr "Plugin-Repository hinzufügen"
+
+#: ../../Zotlabs/Module/Admin.php:1417 ../../Zotlabs/Module/Settings.php:77
+#: ../../Zotlabs/Module/Settings.php:616 ../../include/apps.php:284
+msgid "Update"
+msgstr "Aktualisieren"
+
+#: ../../Zotlabs/Module/Admin.php:1418
+msgid "Switch branch"
+msgstr "Zweig/Branch wechseln"
+
+#: ../../Zotlabs/Module/Admin.php:1419 ../../Zotlabs/Module/Photos.php:998
+#: ../../Zotlabs/Module/Tagrm.php:137
+msgid "Remove"
+msgstr "Entferne"
+
+#: ../../Zotlabs/Module/Admin.php:1530
 msgid "No themes found."
 msgstr "Keine Theme gefunden."
 
-#: ../../Zotlabs/Module/Admin.php:1487
+#: ../../Zotlabs/Module/Admin.php:1586
 msgid "Screenshot"
 msgstr "Bildschirmfoto"
 
-#: ../../Zotlabs/Module/Admin.php:1494 ../../Zotlabs/Module/Admin.php:1528
-#: ../../include/widgets.php:1340
+#: ../../Zotlabs/Module/Admin.php:1593 ../../Zotlabs/Module/Admin.php:1627
+#: ../../include/widgets.php:1389
 msgid "Themes"
 msgstr "Themes"
 
-#: ../../Zotlabs/Module/Admin.php:1533
+#: ../../Zotlabs/Module/Admin.php:1632
 msgid "[Experimental]"
 msgstr "[Experimentell]"
 
-#: ../../Zotlabs/Module/Admin.php:1534
+#: ../../Zotlabs/Module/Admin.php:1633
 msgid "[Unsupported]"
 msgstr "[Nicht unterstützt]"
 
-#: ../../Zotlabs/Module/Admin.php:1558
+#: ../../Zotlabs/Module/Admin.php:1657
 msgid "Log settings updated."
 msgstr "Protokoll-Einstellungen aktualisiert."
 
-#: ../../Zotlabs/Module/Admin.php:1613 ../../include/widgets.php:1361
-#: ../../include/widgets.php:1371
+#: ../../Zotlabs/Module/Admin.php:1712 ../../include/widgets.php:1410
+#: ../../include/widgets.php:1420
 msgid "Logs"
 msgstr "Protokolle"
 
-#: ../../Zotlabs/Module/Admin.php:1615
+#: ../../Zotlabs/Module/Admin.php:1714
 msgid "Clear"
 msgstr "Leeren"
 
-#: ../../Zotlabs/Module/Admin.php:1621
+#: ../../Zotlabs/Module/Admin.php:1720
 msgid "Debugging"
 msgstr "Debugging"
 
-#: ../../Zotlabs/Module/Admin.php:1622
+#: ../../Zotlabs/Module/Admin.php:1721
 msgid "Log file"
 msgstr "Protokolldatei"
 
-#: ../../Zotlabs/Module/Admin.php:1622
+#: ../../Zotlabs/Module/Admin.php:1721
 msgid ""
 "Must be writable by web server. Relative to your Red top-level directory."
 msgstr "Muss für den Webserver schreibbar sein. Relativ zum $Projectname-Stammverzeichnis."
 
-#: ../../Zotlabs/Module/Admin.php:1623
+#: ../../Zotlabs/Module/Admin.php:1722
 msgid "Log level"
 msgstr "Protokollstufe"
 
-#: ../../Zotlabs/Module/Admin.php:1690
+#: ../../Zotlabs/Module/Admin.php:1990
 msgid "New Profile Field"
 msgstr "Neues Profilfeld"
 
-#: ../../Zotlabs/Module/Admin.php:1691 ../../Zotlabs/Module/Admin.php:1711
+#: ../../Zotlabs/Module/Admin.php:1991 ../../Zotlabs/Module/Admin.php:2011
 msgid "Field nickname"
 msgstr "Kurzname für das Feld"
 
-#: ../../Zotlabs/Module/Admin.php:1691 ../../Zotlabs/Module/Admin.php:1711
+#: ../../Zotlabs/Module/Admin.php:1991 ../../Zotlabs/Module/Admin.php:2011
 msgid "System name of field"
 msgstr "Systemname des Feldes"
 
-#: ../../Zotlabs/Module/Admin.php:1692 ../../Zotlabs/Module/Admin.php:1712
+#: ../../Zotlabs/Module/Admin.php:1992 ../../Zotlabs/Module/Admin.php:2012
 msgid "Input type"
 msgstr "Art des Inhalts"
 
-#: ../../Zotlabs/Module/Admin.php:1693 ../../Zotlabs/Module/Admin.php:1713
+#: ../../Zotlabs/Module/Admin.php:1993 ../../Zotlabs/Module/Admin.php:2013
 msgid "Field Name"
 msgstr "Feldname"
 
-#: ../../Zotlabs/Module/Admin.php:1693 ../../Zotlabs/Module/Admin.php:1713
+#: ../../Zotlabs/Module/Admin.php:1993 ../../Zotlabs/Module/Admin.php:2013
 msgid "Label on profile pages"
 msgstr "Bezeichnung auf Profilseiten"
 
-#: ../../Zotlabs/Module/Admin.php:1694 ../../Zotlabs/Module/Admin.php:1714
+#: ../../Zotlabs/Module/Admin.php:1994 ../../Zotlabs/Module/Admin.php:2014
 msgid "Help text"
 msgstr "Hilfetext"
 
-#: ../../Zotlabs/Module/Admin.php:1694 ../../Zotlabs/Module/Admin.php:1714
+#: ../../Zotlabs/Module/Admin.php:1994 ../../Zotlabs/Module/Admin.php:2014
 msgid "Additional info (optional)"
 msgstr "Zusätzliche Informationen (optional)"
 
-#: ../../Zotlabs/Module/Admin.php:1695 ../../Zotlabs/Module/Admin.php:1715
+#: ../../Zotlabs/Module/Admin.php:1995 ../../Zotlabs/Module/Admin.php:2015
 #: ../../Zotlabs/Module/Filer.php:53 ../../Zotlabs/Module/Rbmark.php:32
 #: ../../Zotlabs/Module/Rbmark.php:104 ../../include/widgets.php:201
-#: ../../include/text.php:905 ../../include/text.php:917
+#: ../../include/text.php:934 ../../include/text.php:946
 msgid "Save"
 msgstr "Speichern"
 
-#: ../../Zotlabs/Module/Admin.php:1704
+#: ../../Zotlabs/Module/Admin.php:2004
 msgid "Field definition not found"
 msgstr "Feld-Definition nicht gefunden"
 
-#: ../../Zotlabs/Module/Admin.php:1710
+#: ../../Zotlabs/Module/Admin.php:2010
 msgid "Edit Profile Field"
 msgstr "Profilfeld bearbeiten"
 
-#: ../../Zotlabs/Module/Admin.php:1768 ../../include/widgets.php:1342
+#: ../../Zotlabs/Module/Admin.php:2068 ../../include/widgets.php:1391
 msgid "Profile Fields"
 msgstr "Profil Felder"
 
-#: ../../Zotlabs/Module/Admin.php:1769
+#: ../../Zotlabs/Module/Admin.php:2069
 msgid "Basic Profile Fields"
 msgstr "Notwendige Profil Felder"
 
-#: ../../Zotlabs/Module/Admin.php:1770
+#: ../../Zotlabs/Module/Admin.php:2070
 msgid "Advanced Profile Fields"
 msgstr "Erweiterte Profil Felder"
 
-#: ../../Zotlabs/Module/Admin.php:1770
+#: ../../Zotlabs/Module/Admin.php:2070
 msgid "(In addition to basic fields)"
 msgstr "(zusätzlich zu notwendige Felder)"
 
-#: ../../Zotlabs/Module/Admin.php:1772
+#: ../../Zotlabs/Module/Admin.php:2072
 msgid "All available fields"
 msgstr "Alle verfügbaren Felder"
 
-#: ../../Zotlabs/Module/Admin.php:1773
+#: ../../Zotlabs/Module/Admin.php:2073
 msgid "Custom Fields"
 msgstr "Benutzerdefinierte Felder"
 
-#: ../../Zotlabs/Module/Admin.php:1777
+#: ../../Zotlabs/Module/Admin.php:2077
 msgid "Create Custom Field"
 msgstr "Erstelle benutzerdefiniertes Feld"
 
@@ -1328,68 +1422,72 @@ msgid ""
 " and/or create new posts for you?"
 msgstr "Möchtest Du dieser Anwendung erlauben, Deine Nachrichten und Kontakte abzurufen und/oder neue Nachrichten für Dich zu erstellen?"
 
-#: ../../Zotlabs/Module/Appman.php:32 ../../Zotlabs/Module/Appman.php:48
+#: ../../Zotlabs/Module/Appman.php:36 ../../Zotlabs/Module/Appman.php:52
 msgid "App installed."
 msgstr "App installiert."
 
-#: ../../Zotlabs/Module/Appman.php:41
+#: ../../Zotlabs/Module/Appman.php:45
 msgid "Malformed app."
 msgstr "Fehlerhafte App."
 
-#: ../../Zotlabs/Module/Appman.php:84
+#: ../../Zotlabs/Module/Appman.php:103
 msgid "Embed code"
 msgstr "Code einbetten"
 
-#: ../../Zotlabs/Module/Appman.php:90
+#: ../../Zotlabs/Module/Appman.php:109 ../../include/widgets.php:107
 msgid "Edit App"
 msgstr "App bearbeiten"
 
-#: ../../Zotlabs/Module/Appman.php:90
+#: ../../Zotlabs/Module/Appman.php:109
 msgid "Create App"
 msgstr "App erstellen"
 
-#: ../../Zotlabs/Module/Appman.php:95
+#: ../../Zotlabs/Module/Appman.php:114
 msgid "Name of app"
 msgstr "Name der App"
 
-#: ../../Zotlabs/Module/Appman.php:95 ../../Zotlabs/Module/Appman.php:96
-#: ../../Zotlabs/Module/Events.php:448 ../../Zotlabs/Module/Events.php:453
-#: ../../Zotlabs/Module/Profiles.php:712 ../../Zotlabs/Module/Profiles.php:716
+#: ../../Zotlabs/Module/Appman.php:114 ../../Zotlabs/Module/Appman.php:115
+#: ../../Zotlabs/Module/Events.php:449 ../../Zotlabs/Module/Events.php:454
+#: ../../Zotlabs/Module/Profiles.php:713 ../../Zotlabs/Module/Profiles.php:717
 #: ../../include/datetime.php:246
 msgid "Required"
 msgstr "Benötigt"
 
-#: ../../Zotlabs/Module/Appman.php:96
+#: ../../Zotlabs/Module/Appman.php:115
 msgid "Location (URL) of app"
 msgstr "Ort (URL) der App"
 
-#: ../../Zotlabs/Module/Appman.php:97 ../../Zotlabs/Module/Events.php:461
+#: ../../Zotlabs/Module/Appman.php:116 ../../Zotlabs/Module/Events.php:462
 #: ../../Zotlabs/Module/Rbmark.php:101
 msgid "Description"
 msgstr "Beschreibung"
 
-#: ../../Zotlabs/Module/Appman.php:98
+#: ../../Zotlabs/Module/Appman.php:117
 msgid "Photo icon URL"
 msgstr "URL zum Icon"
 
-#: ../../Zotlabs/Module/Appman.php:98
+#: ../../Zotlabs/Module/Appman.php:117
 msgid "80 x 80 pixels - optional"
 msgstr "80 x 80 Pixel – optional"
 
-#: ../../Zotlabs/Module/Appman.php:99
+#: ../../Zotlabs/Module/Appman.php:118
+msgid "Categories (optional, comma separated list)"
+msgstr "Kategorien (optional, kommagetrennte Liste)"
+
+#: ../../Zotlabs/Module/Appman.php:119
 msgid "Version ID"
 msgstr "Versions-ID"
 
-#: ../../Zotlabs/Module/Appman.php:100
+#: ../../Zotlabs/Module/Appman.php:120
 msgid "Price of app"
 msgstr "Preis der App"
 
-#: ../../Zotlabs/Module/Appman.php:101
+#: ../../Zotlabs/Module/Appman.php:121
 msgid "Location (URL) to purchase app"
 msgstr "Ort (URL), um die App zu kaufen"
 
-#: ../../Zotlabs/Module/Apps.php:40 ../../include/widgets.php:102
-#: ../../include/nav.php:165
+#: ../../Zotlabs/Module/Apps.php:46 ../../include/widgets.php:102
+#: ../../include/nav.php:163
 msgid "Apps"
 msgstr "Apps"
 
@@ -1406,38 +1504,39 @@ msgstr "Ungültiges Element."
 msgid "Channel not found."
 msgstr "Kanal nicht gefunden."
 
-#: ../../Zotlabs/Module/Blocks.php:99 ../../Zotlabs/Module/Blocks.php:154
+#: ../../Zotlabs/Module/Blocks.php:97 ../../Zotlabs/Module/Blocks.php:152
+#: ../../Zotlabs/Module/Editblock.php:108
 msgid "Block Name"
 msgstr "Block-Name"
 
-#: ../../Zotlabs/Module/Blocks.php:153 ../../include/text.php:2278
+#: ../../Zotlabs/Module/Blocks.php:151 ../../include/text.php:2277
 msgid "Blocks"
 msgstr "Blöcke"
 
-#: ../../Zotlabs/Module/Blocks.php:155
+#: ../../Zotlabs/Module/Blocks.php:153
 msgid "Block Title"
 msgstr "Titel des Blocks"
 
-#: ../../Zotlabs/Module/Blocks.php:156 ../../Zotlabs/Module/Layouts.php:186
-#: ../../Zotlabs/Module/Menu.php:114 ../../Zotlabs/Module/Webpages.php:200
+#: ../../Zotlabs/Module/Blocks.php:154 ../../Zotlabs/Module/Layouts.php:188
+#: ../../Zotlabs/Module/Menu.php:114 ../../Zotlabs/Module/Webpages.php:198
 #: ../../include/page_widgets.php:44
 msgid "Created"
 msgstr "Erstellt"
 
-#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Layouts.php:187
-#: ../../Zotlabs/Module/Menu.php:115 ../../Zotlabs/Module/Webpages.php:201
+#: ../../Zotlabs/Module/Blocks.php:155 ../../Zotlabs/Module/Layouts.php:189
+#: ../../Zotlabs/Module/Menu.php:115 ../../Zotlabs/Module/Webpages.php:199
 #: ../../include/page_widgets.php:45
 msgid "Edited"
 msgstr "Geändert"
 
-#: ../../Zotlabs/Module/Blocks.php:160 ../../Zotlabs/Module/Layouts.php:189
-#: ../../Zotlabs/Module/Photos.php:1071 ../../Zotlabs/Module/Webpages.php:190
-#: ../../include/conversation.php:1209
+#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Layouts.php:191
+#: ../../Zotlabs/Module/Photos.php:1072 ../../Zotlabs/Module/Webpages.php:188
+#: ../../include/conversation.php:1214
 msgid "Share"
 msgstr "Teilen"
 
-#: ../../Zotlabs/Module/Blocks.php:165 ../../Zotlabs/Module/Layouts.php:193
-#: ../../Zotlabs/Module/Pubsites.php:46 ../../Zotlabs/Module/Webpages.php:195
+#: ../../Zotlabs/Module/Blocks.php:163 ../../Zotlabs/Module/Layouts.php:195
+#: ../../Zotlabs/Module/Pubsites.php:46 ../../Zotlabs/Module/Webpages.php:193
 #: ../../include/page_widgets.php:39
 msgid "View"
 msgstr "Ansicht"
@@ -1454,79 +1553,69 @@ msgstr "Meine Lesezeichen"
 msgid "My Connections Bookmarks"
 msgstr "Lesezeichen meiner Kontakte"
 
-#: ../../Zotlabs/Module/Cal.php:41 ../../Zotlabs/Module/Photos.php:45
-#: ../../include/js_strings.php:13
-msgid "everybody"
-msgstr "alle"
-
 #: ../../Zotlabs/Module/Cal.php:72
 msgid "Permissions denied."
 msgstr "Berechtigung verweigert."
 
-#: ../../Zotlabs/Module/Cal.php:262 ../../Zotlabs/Module/Events.php:585
+#: ../../Zotlabs/Module/Cal.php:262 ../../Zotlabs/Module/Events.php:588
 msgid "l, F j"
 msgstr "l, j. F"
 
-#: ../../Zotlabs/Module/Cal.php:311 ../../Zotlabs/Module/Events.php:634
+#: ../../Zotlabs/Module/Cal.php:311 ../../Zotlabs/Module/Events.php:637
 #: ../../include/text.php:1743
 msgid "Link to Source"
 msgstr "Link zur Quelle"
 
-#: ../../Zotlabs/Module/Cal.php:334 ../../Zotlabs/Module/Events.php:662
+#: ../../Zotlabs/Module/Cal.php:334 ../../Zotlabs/Module/Events.php:665
 msgid "Edit Event"
 msgstr "Termin bearbeiten"
 
-#: ../../Zotlabs/Module/Cal.php:334 ../../Zotlabs/Module/Events.php:662
+#: ../../Zotlabs/Module/Cal.php:334 ../../Zotlabs/Module/Events.php:665
 msgid "Create Event"
 msgstr "Termin anlegen"
 
 #: ../../Zotlabs/Module/Cal.php:335 ../../Zotlabs/Module/Cal.php:342
-#: ../../Zotlabs/Module/Events.php:663 ../../Zotlabs/Module/Events.php:670
-#: ../../Zotlabs/Module/Photos.php:948
+#: ../../Zotlabs/Module/Events.php:666 ../../Zotlabs/Module/Events.php:673
+#: ../../Zotlabs/Module/Photos.php:949
 msgid "Previous"
 msgstr "Voriges"
 
 #: ../../Zotlabs/Module/Cal.php:336 ../../Zotlabs/Module/Cal.php:343
-#: ../../Zotlabs/Module/Events.php:664 ../../Zotlabs/Module/Events.php:671
-#: ../../Zotlabs/Module/Photos.php:957 ../../Zotlabs/Module/Setup.php:290
+#: ../../Zotlabs/Module/Events.php:667 ../../Zotlabs/Module/Events.php:674
+#: ../../Zotlabs/Module/Photos.php:958 ../../Zotlabs/Module/Setup.php:290
 msgid "Next"
 msgstr "Nächste"
 
-#: ../../Zotlabs/Module/Cal.php:337 ../../Zotlabs/Module/Events.php:665
-#: ../../include/widgets.php:706
+#: ../../Zotlabs/Module/Cal.php:337 ../../Zotlabs/Module/Events.php:668
+#: ../../include/widgets.php:755
 msgid "Export"
 msgstr "Exportieren"
 
-#: ../../Zotlabs/Module/Cal.php:340 ../../Zotlabs/Module/Events.php:668
-#: ../../include/widgets.php:707
+#: ../../Zotlabs/Module/Cal.php:340 ../../Zotlabs/Module/Events.php:671
+#: ../../include/widgets.php:756
 msgid "Import"
 msgstr "Import"
 
-#: ../../Zotlabs/Module/Cal.php:344 ../../Zotlabs/Module/Events.php:672
+#: ../../Zotlabs/Module/Cal.php:344 ../../Zotlabs/Module/Events.php:675
 msgid "Today"
 msgstr "Heute"
 
-#: ../../Zotlabs/Module/Channel.php:28 ../../Zotlabs/Module/Chat.php:23
+#: ../../Zotlabs/Module/Channel.php:29 ../../Zotlabs/Module/Chat.php:23
 msgid "You must be logged in to see this page."
 msgstr "Du musst angemeldet sein, um diese Seite betrachten zu können."
 
-#: ../../Zotlabs/Module/Channel.php:40
+#: ../../Zotlabs/Module/Channel.php:41
 msgid "Posts and comments"
 msgstr "Beiträge und Kommentare"
 
-#: ../../Zotlabs/Module/Channel.php:41
+#: ../../Zotlabs/Module/Channel.php:42
 msgid "Only posts"
 msgstr "Nur Beiträge"
 
-#: ../../Zotlabs/Module/Channel.php:101
+#: ../../Zotlabs/Module/Channel.php:102
 msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr "Unzureichende Zugriffsrechte. Die Anfrage wurde zur Profil-Seite umgeleitet."
 
-#: ../../Zotlabs/Module/Channel.php:135 ../../Zotlabs/Module/Network.php:173
-#: ../../Zotlabs/Module/Rpost.php:118
-msgid "Public"
-msgstr "Öffentlich"
-
 #: ../../Zotlabs/Module/Chat.php:179
 msgid "Room not found"
 msgstr "Chatraum nicht gefunden"
@@ -1552,21 +1641,19 @@ msgid "Bookmark this room"
 msgstr "Lesezeichen für diesen Raum setzen"
 
 #: ../../Zotlabs/Module/Chat.php:203 ../../Zotlabs/Module/Mail.php:206
-#: ../../Zotlabs/Module/Mail.php:320 ../../include/conversation.php:1170
+#: ../../Zotlabs/Module/Mail.php:320 ../../include/conversation.php:1182
 msgid "Please enter a link URL:"
 msgstr "Gib eine URL ein:"
 
-#: ../../Zotlabs/Module/Chat.php:204 ../../Zotlabs/Module/Editpost.php:163
-#: ../../Zotlabs/Module/Mail.php:259 ../../Zotlabs/Module/Mail.php:389
-#: ../../include/ItemObject.php:715 ../../include/conversation.php:1274
+#: ../../Zotlabs/Module/Chat.php:204 ../../Zotlabs/Module/Mail.php:259
+#: ../../Zotlabs/Module/Mail.php:389 ../../include/ItemObject.php:715
+#: ../../include/conversation.php:1262
 msgid "Encrypt text"
 msgstr "Text verschlüsseln"
 
-#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Editblock.php:149
-#: ../../Zotlabs/Module/Editlayout.php:147
-#: ../../Zotlabs/Module/Editpost.php:126
-#: ../../Zotlabs/Module/Editwebpage.php:189 ../../Zotlabs/Module/Mail.php:253
-#: ../../Zotlabs/Module/Mail.php:383 ../../include/conversation.php:1225
+#: ../../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
 msgid "Insert web link"
 msgstr "Link einfügen"
 
@@ -1586,10 +1673,10 @@ msgstr "Chatraumname"
 msgid "Expiration of chats (minutes)"
 msgstr "Verfall von Chats (Minuten)"
 
-#: ../../Zotlabs/Module/Chat.php:233 ../../Zotlabs/Module/Filestorage.php:151
-#: ../../Zotlabs/Module/Photos.php:670 ../../Zotlabs/Module/Photos.php:1044
+#: ../../Zotlabs/Module/Chat.php:233 ../../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:251
+#: ../../include/acl_selectors.php:285
 msgid "Permissions"
 msgstr "Berechtigungen"
 
@@ -1602,8 +1689,8 @@ msgstr "%1$ss Chaträume"
 msgid "No chatrooms available"
 msgstr "Keine Chaträume verfügbar"
 
-#: ../../Zotlabs/Module/Chat.php:250 ../../Zotlabs/Module/Manage.php:141
-#: ../../Zotlabs/Module/Profiles.php:781
+#: ../../Zotlabs/Module/Chat.php:250 ../../Zotlabs/Module/Manage.php:143
+#: ../../Zotlabs/Module/Profiles.php:782
 msgid "Create New"
 msgstr "Neu anlegen"
 
@@ -1704,13 +1791,13 @@ msgstr "Archiviert"
 
 #: ../../Zotlabs/Module/Connections.php:76
 #: ../../Zotlabs/Module/Connections.php:86 ../../Zotlabs/Module/Menu.php:116
-#: ../../include/conversation.php:1553
+#: ../../include/conversation.php:1541
 msgid "New"
 msgstr "Neu"
 
 #: ../../Zotlabs/Module/Connections.php:92
 #: ../../Zotlabs/Module/Connections.php:107
-#: ../../Zotlabs/Module/Connedit.php:597 ../../include/widgets.php:448
+#: ../../Zotlabs/Module/Connedit.php:597 ../../include/widgets.php:497
 msgid "All"
 msgstr "Alle"
 
@@ -1794,14 +1881,15 @@ msgstr "Ignorieren"
 msgid "Recent activity"
 msgstr "Kürzliche Aktivitäten"
 
-#: ../../Zotlabs/Module/Connections.php:302 ../../include/text.php:834
-#: ../../include/nav.php:189
+#: ../../Zotlabs/Module/Connections.php:302 ../../include/nav.php:186
+#: ../../include/text.php:863 ../../include/apps.php:159
 msgid "Connections"
 msgstr "Verbindungen"
 
 #: ../../Zotlabs/Module/Connections.php:306 ../../Zotlabs/Module/Search.php:44
-#: ../../include/apps.php:147 ../../include/text.php:904
-#: ../../include/text.php:916 ../../include/nav.php:167
+#: ../../include/acl_selectors.php:278 ../../include/nav.php:165
+#: ../../include/text.php:933 ../../include/text.php:945
+#: ../../include/apps.php:179
 msgid "Search"
 msgstr "Suche"
 
@@ -1857,8 +1945,8 @@ msgstr "Konnte die Adressbuch-Parameter nicht setzen."
 msgid "Connection has been removed."
 msgstr "Verbindung wurde gelöscht."
 
-#: ../../Zotlabs/Module/Connedit.php:520 ../../include/conversation.php:959
-#: ../../include/nav.php:86
+#: ../../Zotlabs/Module/Connedit.php:520 ../../include/nav.php:86
+#: ../../include/conversation.php:959 ../../include/apps.php:170
 msgid "View Profile"
 msgstr "Profil ansehen"
 
@@ -1940,24 +2028,24 @@ msgstr "Die Verbindung ist versteckt!"
 msgid "Delete this connection"
 msgstr "Verbindung löschen"
 
-#: ../../Zotlabs/Module/Connedit.php:593 ../../include/widgets.php:444
+#: ../../Zotlabs/Module/Connedit.php:593 ../../include/widgets.php:493
 msgid "Me"
 msgstr "Ich"
 
-#: ../../Zotlabs/Module/Connedit.php:594 ../../include/widgets.php:445
+#: ../../Zotlabs/Module/Connedit.php:594 ../../include/widgets.php:494
 msgid "Family"
 msgstr "Familie"
 
-#: ../../Zotlabs/Module/Connedit.php:595 ../../Zotlabs/Module/Settings.php:340
-#: ../../Zotlabs/Module/Settings.php:344 ../../Zotlabs/Module/Settings.php:345
-#: ../../Zotlabs/Module/Settings.php:348 ../../Zotlabs/Module/Settings.php:359
+#: ../../Zotlabs/Module/Connedit.php:595 ../../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/identity.php:389 ../../include/identity.php:390
 #: ../../include/identity.php:397 ../../include/profile_selectors.php:80
-#: ../../include/widgets.php:446
+#: ../../include/widgets.php:495
 msgid "Friends"
 msgstr "Freunde"
 
-#: ../../Zotlabs/Module/Connedit.php:596 ../../include/widgets.php:447
+#: ../../Zotlabs/Module/Connedit.php:596 ../../include/widgets.php:496
 msgid "Acquaintances"
 msgstr "Bekannte"
 
@@ -1985,11 +2073,11 @@ msgstr "Beziehung und Profile festlegen"
 msgid "none"
 msgstr "Keine"
 
-#: ../../Zotlabs/Module/Connedit.php:705 ../../include/widgets.php:565
+#: ../../Zotlabs/Module/Connedit.php:705 ../../include/widgets.php:614
 msgid "Connection Default Permissions"
 msgstr "Standardzugriffsrechte für neue Verbindungen:"
 
-#: ../../Zotlabs/Module/Connedit.php:705 ../../include/items.php:5159
+#: ../../Zotlabs/Module/Connedit.php:705 ../../include/items.php:3927
 #, php-format
 msgid "Connection: %s"
 msgstr "Verbindung: %s"
@@ -2016,73 +2104,77 @@ msgid ""
 "connections."
 msgstr "Die auf dieser Seite angegebenen Berechtigungen werden auf alle neuen Verbindungen angewendet."
 
-#: ../../Zotlabs/Module/Connedit.php:715
+#: ../../Zotlabs/Module/Connedit.php:714
+msgid "Connection Tools"
+msgstr "Verbindungswerkzeuge"
+
+#: ../../Zotlabs/Module/Connedit.php:716
 msgid "Slide to adjust your degree of friendship"
 msgstr "Verschieben, um den Grad der Freundschaft zu einzustellen"
 
-#: ../../Zotlabs/Module/Connedit.php:716 ../../Zotlabs/Module/Rate.php:161
+#: ../../Zotlabs/Module/Connedit.php:717 ../../Zotlabs/Module/Rate.php:161
 #: ../../include/js_strings.php:20
 msgid "Rating"
 msgstr "Bewertung"
 
-#: ../../Zotlabs/Module/Connedit.php:717
+#: ../../Zotlabs/Module/Connedit.php:718
 msgid "Slide to adjust your rating"
 msgstr "Verschieben, um Deine Bewertung einzustellen"
 
-#: ../../Zotlabs/Module/Connedit.php:718 ../../Zotlabs/Module/Connedit.php:723
+#: ../../Zotlabs/Module/Connedit.php:719 ../../Zotlabs/Module/Connedit.php:724
 msgid "Optionally explain your rating"
 msgstr "Optional kannst Du Deine Bewertung begründen"
 
-#: ../../Zotlabs/Module/Connedit.php:720
+#: ../../Zotlabs/Module/Connedit.php:721
 msgid "Custom Filter"
 msgstr "Benutzerdefinierter Filter"
 
-#: ../../Zotlabs/Module/Connedit.php:721
+#: ../../Zotlabs/Module/Connedit.php:722
 msgid "Only import posts with this text"
 msgstr "Nur Beiträge mit diesem Text importieren"
 
-#: ../../Zotlabs/Module/Connedit.php:721 ../../Zotlabs/Module/Connedit.php:722
+#: ../../Zotlabs/Module/Connedit.php:722 ../../Zotlabs/Module/Connedit.php:723
 msgid ""
 "words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
 "all posts"
 msgstr "Einzelne Wörter pro Zeile, #Tags oder /Reguläre Ausdrücke/. lang=xx (z.B. lang=de) ermöglicht Filterung nach Sprache. Leer lassen, um alle Beiträge zu importieren."
 
-#: ../../Zotlabs/Module/Connedit.php:722
+#: ../../Zotlabs/Module/Connedit.php:723
 msgid "Do not import posts with this text"
 msgstr "Beiträge mit diesem Text nicht importieren"
 
-#: ../../Zotlabs/Module/Connedit.php:724
+#: ../../Zotlabs/Module/Connedit.php:725
 msgid "This information is public!"
 msgstr "Diese Information ist öffentlich!"
 
-#: ../../Zotlabs/Module/Connedit.php:729
+#: ../../Zotlabs/Module/Connedit.php:730
 msgid "Connection Pending Approval"
 msgstr "Verbindung wartet auf Bestätigung"
 
-#: ../../Zotlabs/Module/Connedit.php:732
+#: ../../Zotlabs/Module/Connedit.php:733
 msgid "inherited"
 msgstr "geerbt"
 
-#: ../../Zotlabs/Module/Connedit.php:734
+#: ../../Zotlabs/Module/Connedit.php:735
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr "Bitte wähle ein Profil, das wir %s zeigen sollen, wenn Deine Profilseite über eine verifizierte Verbindung aufgerufen wird."
 
-#: ../../Zotlabs/Module/Connedit.php:736
+#: ../../Zotlabs/Module/Connedit.php:737
 msgid "Their Settings"
 msgstr "Deren Einstellungen"
 
-#: ../../Zotlabs/Module/Connedit.php:737
+#: ../../Zotlabs/Module/Connedit.php:738
 msgid "My Settings"
 msgstr "Meine Einstellungen"
 
-#: ../../Zotlabs/Module/Connedit.php:739
+#: ../../Zotlabs/Module/Connedit.php:740
 msgid "Individual Permissions"
 msgstr "Individuelle Zugriffsrechte"
 
-#: ../../Zotlabs/Module/Connedit.php:740
+#: ../../Zotlabs/Module/Connedit.php:741
 msgid ""
 "Some permissions may be inherited from your channel's <a "
 "href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
@@ -2090,7 +2182,7 @@ msgid ""
 " settings here."
 msgstr "Einige Berechtigungen werden möglicherweise von den globalen <a href=\"settings\">Sicherheits- und Privatsphäre-Einstellungen</a> dieses Kanals vererbt. Diese haben eine höhere Priorität als die Einstellungen an der Verbindung und können hier nicht verändert werden."
 
-#: ../../Zotlabs/Module/Connedit.php:741
+#: ../../Zotlabs/Module/Connedit.php:742
 msgid ""
 "Some permissions may be inherited from your channel's <a "
 "href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
@@ -2098,7 +2190,7 @@ msgid ""
 "they wont have any impact unless the inherited setting changes."
 msgstr "Einige Berechtigungen werden möglicherweise von den globalen <a href=\"settings\">Sicherheits- und Privatsphäre-Einstellungen</a> dieses Kanals geerbt. Diese haben eine höhere Priorität als die Einstellungen an der Verbindung. Werden geerbte Einstellungen hier geändert, hat dies keine Auswirkungen."
 
-#: ../../Zotlabs/Module/Connedit.php:742
+#: ../../Zotlabs/Module/Connedit.php:743
 msgid "Last update:"
 msgstr "Letzte Aktualisierung:"
 
@@ -2132,30 +2224,30 @@ msgstr "Hochladen des Bilds fehlgeschlagen."
 msgid "Unable to process image."
 msgstr "Kann Bild nicht verarbeiten."
 
-#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:5587
+#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4271
 msgid "female"
 msgstr "weiblich"
 
-#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:5588
+#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4272
 #, php-format
 msgid "%1$s updated her %2$s"
 msgstr "%1$s hat ihr %2$s aktualisiert"
 
-#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:5589
+#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:4273
 msgid "male"
 msgstr "männlich"
 
-#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:5590
+#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4274
 #, php-format
 msgid "%1$s updated his %2$s"
 msgstr "%1$s hat sein %2$s aktualisiert"
 
-#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:5592
+#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4276
 #, php-format
 msgid "%1$s updated their %2$s"
 msgstr "%1$s hat sein/ihr %2$s aktualisiert"
 
-#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/identity.php:1800
+#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/identity.php:1807
 msgid "cover photo"
 msgstr "Cover Foto"
 
@@ -2182,7 +2274,7 @@ msgstr "Cover Foto hochladen"
 
 #: ../../Zotlabs/Module/Cover_photo.php:361
 #: ../../Zotlabs/Module/Profile_photo.php:374
-#: ../../Zotlabs/Module/Settings.php:983
+#: ../../Zotlabs/Module/Settings.php:985
 msgid "or"
 msgstr "oder"
 
@@ -2211,12 +2303,8 @@ msgstr "Bitte schneide das Bild für eine optimale Anzeige passend zu."
 msgid "Done Editing"
 msgstr "Bearbeitung fertigstellen"
 
-#: ../../Zotlabs/Module/Dav.php:127
-msgid "$Projectname channel"
-msgstr "$Projectname-Kanal"
-
 #: ../../Zotlabs/Module/Directory.php:63 ../../Zotlabs/Module/Display.php:21
-#: ../../Zotlabs/Module/Photos.php:521 ../../Zotlabs/Module/Ratings.php:86
+#: ../../Zotlabs/Module/Photos.php:522 ../../Zotlabs/Module/Ratings.php:86
 #: ../../Zotlabs/Module/Search.php:17
 #: ../../Zotlabs/Module/Viewconnections.php:21
 msgid "Public access denied."
@@ -2241,13 +2329,13 @@ msgstr "Status:"
 msgid "Homepage: "
 msgstr "Webseite:"
 
-#: ../../Zotlabs/Module/Directory.php:306 ../../include/identity.php:1322
+#: ../../Zotlabs/Module/Directory.php:306 ../../include/identity.php:1329
 msgid "Age:"
 msgstr "Alter:"
 
-#: ../../Zotlabs/Module/Directory.php:311 ../../include/identity.php:1022
-#: ../../include/bb2diaspora.php:509 ../../include/event.php:52
-#: ../../include/text.php:1452
+#: ../../Zotlabs/Module/Directory.php:311 ../../include/identity.php:1029
+#: ../../include/event.php:52 ../../include/text.php:1481
+#: ../../include/bb2diaspora.php:509
 msgid "Location:"
 msgstr "Ort:"
 
@@ -2255,18 +2343,18 @@ msgstr "Ort:"
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: ../../Zotlabs/Module/Directory.php:322 ../../include/identity.php:1338
+#: ../../Zotlabs/Module/Directory.php:322 ../../include/identity.php:1345
 msgid "Hometown:"
 msgstr "Heimatstadt:"
 
-#: ../../Zotlabs/Module/Directory.php:324 ../../include/identity.php:1346
+#: ../../Zotlabs/Module/Directory.php:324 ../../include/identity.php:1353
 msgid "About:"
 msgstr "Ãœber:"
 
 #: ../../Zotlabs/Module/Directory.php:325 ../../Zotlabs/Module/Match.php:68
-#: ../../Zotlabs/Module/Suggest.php:56 ../../include/identity.php:1007
-#: ../../include/conversation.php:961 ../../include/Contact.php:101
+#: ../../Zotlabs/Module/Suggest.php:56 ../../include/identity.php:1014
 #: ../../include/widgets.php:147 ../../include/widgets.php:184
+#: ../../include/Contact.php:101 ../../include/conversation.php:961
 msgid "Connect"
 msgstr "Verbinden"
 
@@ -2346,7 +2434,7 @@ msgstr "Dieser Verzeichnisserver benötigt einen Zugriffstoken"
 #: ../../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:423
+#: ../../Zotlabs/Module/Subthread.php:62 ../../include/items.php:383
 #: ../../index.php:173
 msgid "Permission denied"
 msgstr "Keine Berechtigung"
@@ -2408,193 +2496,31 @@ msgstr "Doppelte Mail erhalten"
 msgid "mail delivered"
 msgstr "Mail zugestellt"
 
-#: ../../Zotlabs/Module/Editblock.php:82 ../../Zotlabs/Module/Editblock.php:98
-#: ../../Zotlabs/Module/Editlayout.php:80 ../../Zotlabs/Module/Editpost.php:24
+#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95
+#: ../../Zotlabs/Module/Editlayout.php:79 ../../Zotlabs/Module/Editpost.php:24
 #: ../../Zotlabs/Module/Editwebpage.php:81
 msgid "Item not found"
 msgstr "Element nicht gefunden"
 
-#: ../../Zotlabs/Module/Editblock.php:122
-msgid "Delete block?"
-msgstr "Block löschen?"
-
-#: ../../Zotlabs/Module/Editblock.php:141
-#: ../../Zotlabs/Module/Editlayout.php:140
-#: ../../Zotlabs/Module/Editpost.php:119
-#: ../../Zotlabs/Module/Editwebpage.php:182 ../../include/ItemObject.php:704
-#: ../../include/conversation.php:1216
-msgid "Bold"
-msgstr "Fett"
-
-#: ../../Zotlabs/Module/Editblock.php:142
-#: ../../Zotlabs/Module/Editlayout.php:141
-#: ../../Zotlabs/Module/Editpost.php:120
-#: ../../Zotlabs/Module/Editwebpage.php:183 ../../include/ItemObject.php:705
-#: ../../include/conversation.php:1217
-msgid "Italic"
-msgstr "Kursiv"
-
-#: ../../Zotlabs/Module/Editblock.php:143
-#: ../../Zotlabs/Module/Editlayout.php:142
-#: ../../Zotlabs/Module/Editpost.php:121
-#: ../../Zotlabs/Module/Editwebpage.php:184 ../../include/ItemObject.php:706
-#: ../../include/conversation.php:1218
-msgid "Underline"
-msgstr "Unterstrichen"
-
-#: ../../Zotlabs/Module/Editblock.php:144
-#: ../../Zotlabs/Module/Editlayout.php:143
-#: ../../Zotlabs/Module/Editpost.php:122
-#: ../../Zotlabs/Module/Editwebpage.php:185 ../../include/ItemObject.php:707
-#: ../../include/conversation.php:1219
-msgid "Quote"
-msgstr "Zitat"
-
-#: ../../Zotlabs/Module/Editblock.php:145
-#: ../../Zotlabs/Module/Editlayout.php:144
-#: ../../Zotlabs/Module/Editpost.php:123
-#: ../../Zotlabs/Module/Editwebpage.php:186 ../../include/ItemObject.php:708
-#: ../../include/conversation.php:1220
-msgid "Code"
-msgstr "Code"
-
-#: ../../Zotlabs/Module/Editblock.php:147
-#: ../../Zotlabs/Module/Editlayout.php:145
-#: ../../Zotlabs/Module/Editpost.php:124
-#: ../../Zotlabs/Module/Editwebpage.php:187
-#: ../../include/conversation.php:1221
-msgid "Upload photo"
-msgstr "Foto hochladen"
-
-#: ../../Zotlabs/Module/Editblock.php:148
-#: ../../Zotlabs/Module/Editlayout.php:146
-#: ../../Zotlabs/Module/Editpost.php:125
-#: ../../Zotlabs/Module/Editwebpage.php:188 ../../Zotlabs/Module/Mail.php:252
-#: ../../Zotlabs/Module/Mail.php:382 ../../include/conversation.php:1223
-msgid "Attach file"
-msgstr "Datei anhängen"
-
-#: ../../Zotlabs/Module/Editblock.php:150
-#: ../../Zotlabs/Module/Editlayout.php:148
-#: ../../Zotlabs/Module/Editpost.php:127
-#: ../../Zotlabs/Module/Editwebpage.php:190
-msgid "Insert YouTube video"
-msgstr "YouTube-Video einfügen"
-
-#: ../../Zotlabs/Module/Editblock.php:151
-#: ../../Zotlabs/Module/Editlayout.php:149
-#: ../../Zotlabs/Module/Editpost.php:128
-#: ../../Zotlabs/Module/Editwebpage.php:191
-msgid "Insert Vorbis [.ogg] video"
-msgstr "Vorbis [.ogg]-Video einfügen"
-
-#: ../../Zotlabs/Module/Editblock.php:152
-#: ../../Zotlabs/Module/Editlayout.php:150
-#: ../../Zotlabs/Module/Editpost.php:129
-#: ../../Zotlabs/Module/Editwebpage.php:192
-msgid "Insert Vorbis [.ogg] audio"
-msgstr "Vorbis [.ogg]-Audio einfügen"
-
-#: ../../Zotlabs/Module/Editblock.php:153
-#: ../../Zotlabs/Module/Editlayout.php:151
-#: ../../Zotlabs/Module/Editpost.php:130
-#: ../../Zotlabs/Module/Editwebpage.php:193
-#: ../../include/conversation.php:1231
-msgid "Set your location"
-msgstr "Standort"
-
-#: ../../Zotlabs/Module/Editblock.php:154
-#: ../../Zotlabs/Module/Editlayout.php:152
-#: ../../Zotlabs/Module/Editpost.php:131
-#: ../../Zotlabs/Module/Editwebpage.php:194
-#: ../../include/conversation.php:1236
-msgid "Clear browser location"
-msgstr "Browser-Standort löschen"
-
-#: ../../Zotlabs/Module/Editblock.php:155
-#: ../../Zotlabs/Module/Editlayout.php:153
-#: ../../Zotlabs/Module/Editpost.php:135
-#: ../../Zotlabs/Module/Editwebpage.php:195
-#: ../../Zotlabs/Module/Photos.php:1072 ../../include/ItemObject.php:389
-#: ../../include/conversation.php:740 ../../include/conversation.php:1244
-msgid "Please wait"
-msgstr "Bitte warten"
-
-#: ../../Zotlabs/Module/Editblock.php:156
-#: ../../Zotlabs/Module/Editlayout.php:154
-#: ../../Zotlabs/Module/Editpost.php:136
-#: ../../Zotlabs/Module/Editwebpage.php:196
-#: ../../Zotlabs/Module/Events.php:470 ../../include/conversation.php:1245
-msgid "Permission settings"
-msgstr "Berechtigungs-Einstellungen"
-
-#: ../../Zotlabs/Module/Editblock.php:164
-#: ../../Zotlabs/Module/Editlayout.php:161
-#: ../../Zotlabs/Module/Editpost.php:144
-#: ../../Zotlabs/Module/Editwebpage.php:205
-#: ../../include/conversation.php:1254
-msgid "Public post"
-msgstr "Öffentlicher Beitrag"
-
-#: ../../Zotlabs/Module/Editblock.php:167
-#: ../../Zotlabs/Module/Editpost.php:147
-#: ../../Zotlabs/Module/Editwebpage.php:210
-#: ../../include/conversation.php:1239
+#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1234
 msgid "Title (optional)"
 msgstr "Titel (optional)"
 
-#: ../../Zotlabs/Module/Editblock.php:170
-#: ../../Zotlabs/Module/Editlayout.php:168
-#: ../../Zotlabs/Module/Editpost.php:149
-#: ../../Zotlabs/Module/Editwebpage.php:212
-#: ../../include/conversation.php:1243
-msgid "Categories (optional, comma-separated list)"
-msgstr "Kategorien (optional, kommagetrennte Liste)"
-
-#: ../../Zotlabs/Module/Editblock.php:171
-#: ../../Zotlabs/Module/Editlayout.php:169
-#: ../../Zotlabs/Module/Editpost.php:150
-#: ../../Zotlabs/Module/Editwebpage.php:213
-#: ../../include/conversation.php:1256
-msgid "Example: bob@example.com, mary@example.com"
-msgstr "Beispiel: bob@example.com, mary@example.com"
-
-#: ../../Zotlabs/Module/Editblock.php:176
-#: ../../Zotlabs/Module/Editpost.php:155
-#: ../../Zotlabs/Module/Editwebpage.php:217
-#: ../../Zotlabs/Module/Events.php:469 ../../Zotlabs/Module/Photos.php:1092
-#: ../../Zotlabs/Module/Webpages.php:196 ../../include/ItemObject.php:712
-#: ../../include/conversation.php:1186 ../../include/page_widgets.php:40
-msgid "Preview"
-msgstr "Vorschau"
-
-#: ../../Zotlabs/Module/Editblock.php:181
-#: ../../Zotlabs/Module/Editlayout.php:178
-#: ../../Zotlabs/Module/Editpost.php:161
-#: ../../Zotlabs/Module/Editwebpage.php:222 ../../Zotlabs/Module/Mail.php:257
-#: ../../Zotlabs/Module/Mail.php:387 ../../include/conversation.php:1269
-msgid "Set expiration date"
-msgstr "Verfallsdatum"
-
-#: ../../Zotlabs/Module/Editblock.php:186
+#: ../../Zotlabs/Module/Editblock.php:133
 msgid "Edit Block"
 msgstr "Block bearbeiten"
 
-#: ../../Zotlabs/Module/Editlayout.php:116
-msgid "Delete layout?"
-msgstr "Layout löschen?"
-
-#: ../../Zotlabs/Module/Editlayout.php:164
-#: ../../Zotlabs/Module/Layouts.php:128
-msgid "Layout Description (Optional)"
-msgstr "Layout-Beschreibung (optional)"
-
-#: ../../Zotlabs/Module/Editlayout.php:166
-#: ../../Zotlabs/Module/Layouts.php:125 ../../Zotlabs/Module/Layouts.php:184
+#: ../../Zotlabs/Module/Editlayout.php:126
+#: ../../Zotlabs/Module/Layouts.php:127 ../../Zotlabs/Module/Layouts.php:186
 msgid "Layout Name"
 msgstr "Layout-Name"
 
-#: ../../Zotlabs/Module/Editlayout.php:183
+#: ../../Zotlabs/Module/Editlayout.php:127
+#: ../../Zotlabs/Module/Layouts.php:130
+msgid "Layout Description (Optional)"
+msgstr "Layout-Beschreibung (optional)"
+
+#: ../../Zotlabs/Module/Editlayout.php:135
 msgid "Edit Layout"
 msgstr "Layout bearbeiten"
 
@@ -2602,171 +2528,153 @@ msgstr "Layout bearbeiten"
 msgid "Item is not editable"
 msgstr "Element kann nicht bearbeitet werden."
 
-#: ../../Zotlabs/Module/Editpost.php:60 ../../Zotlabs/Module/Mail.php:207
-#: ../../Zotlabs/Module/Mail.php:321 ../../include/conversation.php:1176
-msgid "Expires YYYY-MM-DD HH:MM"
-msgstr "Verfällt YYYY-MM-DD HH;MM"
-
-#: ../../Zotlabs/Module/Editpost.php:61
-msgid "Delete item?"
-msgstr "Eintrag löschen?"
-
-#: ../../Zotlabs/Module/Editpost.php:132 ../../include/conversation.php:1233
-msgid "Toggle voting"
-msgstr "Umfragewerkzeug aktivieren"
-
-#: ../../Zotlabs/Module/Editpost.php:165 ../../include/conversation.php:1276
-msgid "OK"
-msgstr "Ok"
-
-#: ../../Zotlabs/Module/Editpost.php:166 ../../Zotlabs/Module/Fbrowser.php:66
-#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Settings.php:589
-#: ../../Zotlabs/Module/Settings.php:615 ../../Zotlabs/Module/Tagrm.php:15
-#: ../../Zotlabs/Module/Tagrm.php:138 ../../include/conversation.php:1277
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: ../../Zotlabs/Module/Editpost.php:171 ../../Zotlabs/Module/Rpost.php:134
+#: ../../Zotlabs/Module/Editpost.php:106 ../../Zotlabs/Module/Rpost.php:135
 msgid "Edit post"
 msgstr "Bearbeite Beitrag"
 
-#: ../../Zotlabs/Module/Editwebpage.php:157
-msgid "Delete webpage?"
-msgstr "Webseite löschen?"
+#: ../../Zotlabs/Module/Editwebpage.php:143
+msgid "Page link"
+msgstr "Seiten-Link"
 
-#: ../../Zotlabs/Module/Editwebpage.php:177
-msgid "Page link title"
-msgstr "Seitentitel-Link"
-
-#: ../../Zotlabs/Module/Editwebpage.php:227
+#: ../../Zotlabs/Module/Editwebpage.php:169
 msgid "Edit Webpage"
 msgstr "Webseite bearbeiten"
 
-#: ../../Zotlabs/Module/Events.php:25
+#: ../../Zotlabs/Module/Events.php:26
 msgid "Calendar entries imported."
 msgstr "Kalendereinträge wurden importiert."
 
-#: ../../Zotlabs/Module/Events.php:27
+#: ../../Zotlabs/Module/Events.php:28
 msgid "No calendar entries found."
 msgstr "Keine Kalendereinträge gefunden."
 
-#: ../../Zotlabs/Module/Events.php:104
+#: ../../Zotlabs/Module/Events.php:105
 msgid "Event can not end before it has started."
 msgstr "Termin-Ende liegt vor dem Beginn."
 
-#: ../../Zotlabs/Module/Events.php:106 ../../Zotlabs/Module/Events.php:115
-#: ../../Zotlabs/Module/Events.php:135
+#: ../../Zotlabs/Module/Events.php:107 ../../Zotlabs/Module/Events.php:116
+#: ../../Zotlabs/Module/Events.php:136
 msgid "Unable to generate preview."
 msgstr "Vorschau konnte nicht erzeugt werden."
 
-#: ../../Zotlabs/Module/Events.php:113
+#: ../../Zotlabs/Module/Events.php:114
 msgid "Event title and start time are required."
 msgstr "Titel und Startzeit des Termins sind erforderlich."
 
-#: ../../Zotlabs/Module/Events.php:133 ../../Zotlabs/Module/Events.php:258
+#: ../../Zotlabs/Module/Events.php:134 ../../Zotlabs/Module/Events.php:259
 msgid "Event not found."
 msgstr "Termin nicht gefunden."
 
-#: ../../Zotlabs/Module/Events.php:253 ../../Zotlabs/Module/Like.php:373
-#: ../../Zotlabs/Module/Tagger.php:51 ../../include/conversation.php:123
-#: ../../include/event.php:915 ../../include/text.php:1970
+#: ../../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
 msgid "event"
 msgstr "Termin"
 
-#: ../../Zotlabs/Module/Events.php:448
+#: ../../Zotlabs/Module/Events.php:449
 msgid "Edit event title"
 msgstr "Termintitel bearbeiten"
 
-#: ../../Zotlabs/Module/Events.php:448
+#: ../../Zotlabs/Module/Events.php:449
 msgid "Event title"
 msgstr "Termintitel"
 
-#: ../../Zotlabs/Module/Events.php:450
+#: ../../Zotlabs/Module/Events.php:451
 msgid "Categories (comma-separated list)"
 msgstr "Kategorien (Kommagetrennte Liste)"
 
-#: ../../Zotlabs/Module/Events.php:451
+#: ../../Zotlabs/Module/Events.php:452
 msgid "Edit Category"
 msgstr "Kategorie bearbeiten"
 
-#: ../../Zotlabs/Module/Events.php:451
+#: ../../Zotlabs/Module/Events.php:452
 msgid "Category"
 msgstr "Kategorie"
 
-#: ../../Zotlabs/Module/Events.php:454
+#: ../../Zotlabs/Module/Events.php:455
 msgid "Edit start date and time"
 msgstr "Startdatum und -zeit bearbeiten"
 
-#: ../../Zotlabs/Module/Events.php:454
+#: ../../Zotlabs/Module/Events.php:455
 msgid "Start date and time"
 msgstr "Startdatum und -zeit"
 
-#: ../../Zotlabs/Module/Events.php:455 ../../Zotlabs/Module/Events.php:458
+#: ../../Zotlabs/Module/Events.php:456 ../../Zotlabs/Module/Events.php:459
 msgid "Finish date and time are not known or not relevant"
 msgstr "Enddatum und -zeit sind unbekannt oder irrelevant"
 
-#: ../../Zotlabs/Module/Events.php:457
+#: ../../Zotlabs/Module/Events.php:458
 msgid "Edit finish date and time"
 msgstr "Enddatum und -zeit bearbeiten"
 
-#: ../../Zotlabs/Module/Events.php:457
+#: ../../Zotlabs/Module/Events.php:458
 msgid "Finish date and time"
 msgstr "Enddatum und -zeit"
 
-#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:460
+#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:461
 msgid "Adjust for viewer timezone"
 msgstr "An die Zeitzone des Betrachters anpassen"
 
-#: ../../Zotlabs/Module/Events.php:459
+#: ../../Zotlabs/Module/Events.php:460
 msgid ""
 "Important for events that happen in a particular place. Not practical for "
 "global holidays."
 msgstr "Wichtig für Veranstaltungen die an bestimmten Orten stattfinden. Nicht sinnvoll für globale Feiertage / Ferien."
 
-#: ../../Zotlabs/Module/Events.php:461
+#: ../../Zotlabs/Module/Events.php:462
 msgid "Edit Description"
 msgstr "Beschreibung bearbeiten"
 
-#: ../../Zotlabs/Module/Events.php:463
+#: ../../Zotlabs/Module/Events.php:464
 msgid "Edit Location"
 msgstr "Ort bearbeiten"
 
-#: ../../Zotlabs/Module/Events.php:463 ../../Zotlabs/Module/Locs.php:117
-#: ../../Zotlabs/Module/Profiles.php:476 ../../Zotlabs/Module/Profiles.php:701
+#: ../../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
 msgid "Location"
 msgstr "Ort"
 
-#: ../../Zotlabs/Module/Events.php:466 ../../Zotlabs/Module/Events.php:468
+#: ../../Zotlabs/Module/Events.php:467 ../../Zotlabs/Module/Events.php:469
 msgid "Share this event"
 msgstr "Den Termin teilen"
 
-#: ../../Zotlabs/Module/Events.php:473
+#: ../../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
+msgid "Preview"
+msgstr "Vorschau"
+
+#: ../../Zotlabs/Module/Events.php:471 ../../include/conversation.php:1238
+msgid "Permission settings"
+msgstr "Berechtigungs-Einstellungen"
+
+#: ../../Zotlabs/Module/Events.php:476
 msgid "Advanced Options"
 msgstr "Weitere Optionen"
 
-#: ../../Zotlabs/Module/Events.php:607
+#: ../../Zotlabs/Module/Events.php:610
 msgid "Edit event"
 msgstr "Termin bearbeiten"
 
-#: ../../Zotlabs/Module/Events.php:609
+#: ../../Zotlabs/Module/Events.php:612
 msgid "Delete event"
 msgstr "Termin löschen"
 
-#: ../../Zotlabs/Module/Events.php:643
+#: ../../Zotlabs/Module/Events.php:646
 msgid "calendar"
 msgstr "Kalender"
 
-#: ../../Zotlabs/Module/Events.php:703
+#: ../../Zotlabs/Module/Events.php:706
 msgid "Event removed"
 msgstr "Termin gelöscht"
 
-#: ../../Zotlabs/Module/Events.php:706
+#: ../../Zotlabs/Module/Events.php:709
 msgid "Failed to remove event"
 msgstr "Termin konnte nicht gelöscht werden"
 
-#: ../../Zotlabs/Module/Fbrowser.php:29 ../../include/apps.php:139
-#: ../../include/conversation.php:1650 ../../include/nav.php:92
+#: ../../Zotlabs/Module/Fbrowser.php:29 ../../include/nav.php:92
+#: ../../include/conversation.php:1638 ../../include/apps.php:171
 msgid "Photos"
 msgstr "Fotos"
 
@@ -2778,7 +2686,7 @@ msgstr "Inhalte von Firefox nach $Projectname teilen"
 msgid "Activate the Firefox $Projectname provider"
 msgstr "Aktiviert den $Projectname-Provider für firefox"
 
-#: ../../Zotlabs/Module/Filer.php:52 ../../include/conversation.php:1174
+#: ../../Zotlabs/Module/Filer.php:52
 msgid "Save to Folder:"
 msgstr "Speichern in Ordner:"
 
@@ -2786,51 +2694,51 @@ msgstr "Speichern in Ordner:"
 msgid "- select -"
 msgstr "– auswählen –"
 
-#: ../../Zotlabs/Module/Filestorage.php:86
+#: ../../Zotlabs/Module/Filestorage.php:88
 msgid "Permission Denied."
 msgstr "Zugriff verweigert."
 
-#: ../../Zotlabs/Module/Filestorage.php:102
+#: ../../Zotlabs/Module/Filestorage.php:104
 msgid "File not found."
 msgstr "Datei nicht gefunden."
 
-#: ../../Zotlabs/Module/Filestorage.php:145
+#: ../../Zotlabs/Module/Filestorage.php:147
 msgid "Edit file permissions"
 msgstr "Dateiberechtigungen bearbeiten"
 
-#: ../../Zotlabs/Module/Filestorage.php:154
+#: ../../Zotlabs/Module/Filestorage.php:156
 msgid "Set/edit permissions"
 msgstr "Berechtigungen setzen/ändern"
 
-#: ../../Zotlabs/Module/Filestorage.php:155
+#: ../../Zotlabs/Module/Filestorage.php:157
 msgid "Include all files and sub folders"
 msgstr "Alle Dateien und Unterverzeichnisse einbinden"
 
-#: ../../Zotlabs/Module/Filestorage.php:156
+#: ../../Zotlabs/Module/Filestorage.php:158
 msgid "Return to file list"
 msgstr "Zurück zur Dateiliste"
 
-#: ../../Zotlabs/Module/Filestorage.php:158
+#: ../../Zotlabs/Module/Filestorage.php:160
 msgid "Copy/paste this code to attach file to a post"
 msgstr "Diesen Code kopieren und einfügen, um die Datei an einen Beitrag anzuhängen"
 
-#: ../../Zotlabs/Module/Filestorage.php:159
+#: ../../Zotlabs/Module/Filestorage.php:161
 msgid "Copy/paste this URL to link file from a web page"
 msgstr "Diese URL verwenden, um von einer Webseite aus auf die Datei zu verlinken"
 
-#: ../../Zotlabs/Module/Filestorage.php:161
+#: ../../Zotlabs/Module/Filestorage.php:163
 msgid "Share this file"
 msgstr "Diese Datei freigeben"
 
-#: ../../Zotlabs/Module/Filestorage.php:162
+#: ../../Zotlabs/Module/Filestorage.php:164
 msgid "Show URL to this file"
 msgstr "URL zu dieser Datei anzeigen"
 
-#: ../../Zotlabs/Module/Filestorage.php:163
+#: ../../Zotlabs/Module/Filestorage.php:165
 msgid "Notify your contacts about this file"
 msgstr "Meine Kontakte über diese Datei benachrichtigen"
 
-#: ../../Zotlabs/Module/Follow.php:31
+#: ../../Zotlabs/Module/Follow.php:34
 msgid "Channel added."
 msgstr "Kanal hinzugefügt."
 
@@ -2860,7 +2768,7 @@ msgid "Could not create privacy group."
 msgstr "Gruppe konnte nicht erstellt werden."
 
 #: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141
-#: ../../include/items.php:5126
+#: ../../include/items.php:3894
 msgid "Privacy group not found."
 msgstr "Gruppe nicht gefunden."
 
@@ -2914,8 +2822,8 @@ msgid "Help:"
 msgstr "Hilfe:"
 
 #: ../../Zotlabs/Module/Help.php:85 ../../Zotlabs/Module/Help.php:90
-#: ../../Zotlabs/Module/Layouts.php:181 ../../include/apps.php:142
-#: ../../include/nav.php:161
+#: ../../Zotlabs/Module/Layouts.php:183 ../../include/nav.php:159
+#: ../../include/apps.php:174
 msgid "Help"
 msgstr "Hilfe"
 
@@ -2950,7 +2858,7 @@ msgid "Full Name"
 msgstr "Voller Name"
 
 #: ../../Zotlabs/Module/Id.php:19 ../../Zotlabs/Module/Id.php:20
-#: ../../Zotlabs/Module/Id.php:21 ../../include/apps.php:155
+#: ../../Zotlabs/Module/Id.php:21 ../../include/apps.php:187
 msgid "Profile Photo"
 msgstr "Profilfoto"
 
@@ -2982,11 +2890,11 @@ msgstr "Profilfoto 128 px"
 msgid "Timezone"
 msgstr "Zeitzone"
 
-#: ../../Zotlabs/Module/Id.php:29 ../../Zotlabs/Module/Profiles.php:734
+#: ../../Zotlabs/Module/Id.php:29 ../../Zotlabs/Module/Profiles.php:735
 msgid "Homepage URL"
 msgstr "Homepage-URL"
 
-#: ../../Zotlabs/Module/Id.php:30 ../../include/apps.php:153
+#: ../../Zotlabs/Module/Id.php:30 ../../include/apps.php:185
 msgid "Language"
 msgstr "Sprache"
 
@@ -3070,7 +2978,7 @@ msgstr "Die importierte Datei ist leer."
 msgid "Warning: Database versions differ by %1$d updates."
 msgstr "Achtung: Datenbankversionen unterscheiden sich um %1$d Aktualisierungen."
 
-#: ../../Zotlabs/Module/Import.php:150 ../../include/import.php:80
+#: ../../Zotlabs/Module/Import.php:150 ../../include/import.php:84
 msgid "Cloned channel not found. Import failed."
 msgstr "Geklonter Kanal nicht gefunden. Import fehlgeschlagen."
 
@@ -3260,19 +3168,19 @@ msgstr "Du hast die maximale Anzahl von %1$.0f Beiträgen erreicht."
 msgid "You have reached your limit of %1$.0f webpages."
 msgstr "Du hast die maximale Anzahl von %1$.0f Webseiten erreicht."
 
-#: ../../Zotlabs/Module/Layouts.php:179 ../../include/text.php:2280
+#: ../../Zotlabs/Module/Layouts.php:181 ../../include/text.php:2279
 msgid "Layouts"
 msgstr "Layouts"
 
-#: ../../Zotlabs/Module/Layouts.php:181
+#: ../../Zotlabs/Module/Layouts.php:183
 msgid "Comanche page description language help"
 msgstr "Hilfe zur Comanche-Seitenbeschreibungssprache"
 
-#: ../../Zotlabs/Module/Layouts.php:185
+#: ../../Zotlabs/Module/Layouts.php:187
 msgid "Layout Description"
 msgstr "Layout-Beschreibung"
 
-#: ../../Zotlabs/Module/Layouts.php:190
+#: ../../Zotlabs/Module/Layouts.php:192
 msgid "Download PDL file"
 msgstr "PDL-Datei herunterladen"
 
@@ -3313,12 +3221,12 @@ msgstr "Die vorherige Aktion wurde rückgängig gemacht."
 
 #: ../../Zotlabs/Module/Like.php:371 ../../Zotlabs/Module/Subthread.php:87
 #: ../../Zotlabs/Module/Tagger.php:47 ../../include/conversation.php:120
-#: ../../include/text.php:1967
+#: ../../include/text.php:1952
 msgid "photo"
 msgstr "Foto"
 
 #: ../../Zotlabs/Module/Like.php:371 ../../Zotlabs/Module/Subthread.php:87
-#: ../../include/conversation.php:148 ../../include/text.php:1973
+#: ../../include/conversation.php:148 ../../include/text.php:1958
 msgid "status"
 msgstr "Status"
 
@@ -3454,7 +3362,7 @@ msgid ""
 "Password reset failed."
 msgstr "Die Anfrage konnte nicht verifiziert werden. (Vielleicht hast Du schon einmal auf den Link in der E-Mail geklickt?) Passwort-Rücksetzung fehlgeschlagen."
 
-#: ../../Zotlabs/Module/Lostpass.php:90 ../../boot.php:1610
+#: ../../Zotlabs/Module/Lostpass.php:90 ../../boot.php:1623
 msgid "Password Reset"
 msgstr "Zurücksetzen des Kennworts"
 
@@ -3535,6 +3443,10 @@ msgstr "Nachricht widerrufen."
 msgid "Conversation removed."
 msgstr "Unterhaltung gelöscht."
 
+#: ../../Zotlabs/Module/Mail.php:207 ../../Zotlabs/Module/Mail.php:321
+msgid "Expires YYYY-MM-DD HH:MM"
+msgstr "Verfällt YYYY-MM-DD HH;MM"
+
 #: ../../Zotlabs/Module/Mail.php:235
 msgid "Requested channel is not in this network"
 msgstr "Angeforderter Kanal ist nicht in diesem Netzwerk."
@@ -3551,10 +3463,20 @@ msgstr "An:"
 msgid "Subject:"
 msgstr "Betreff:"
 
+#: ../../Zotlabs/Module/Mail.php:252 ../../Zotlabs/Module/Mail.php:382
+#: ../../include/conversation.php:1226
+msgid "Attach file"
+msgstr "Datei anhängen"
+
 #: ../../Zotlabs/Module/Mail.php:254
 msgid "Send"
 msgstr "Absenden"
 
+#: ../../Zotlabs/Module/Mail.php:257 ../../Zotlabs/Module/Mail.php:387
+#: ../../include/conversation.php:1257
+msgid "Set expiration date"
+msgstr "Verfallsdatum"
+
 #: ../../Zotlabs/Module/Mail.php:346
 msgid "Delete message"
 msgstr "Nachricht löschen"
@@ -3590,48 +3512,48 @@ msgstr "Antwort senden"
 msgid "Your message for %s (%s):"
 msgstr "Deine Nachricht für %s (%s):"
 
-#: ../../Zotlabs/Module/Manage.php:134
+#: ../../Zotlabs/Module/Manage.php:136
 #: ../../Zotlabs/Module/New_channel.php:121
 #, php-format
 msgid "You have created %1$.0f of %2$.0f allowed channels."
 msgstr "Du hast %1$.0f von maximal %2$.0f erlaubten Kanälen eingerichtet."
 
-#: ../../Zotlabs/Module/Manage.php:141
+#: ../../Zotlabs/Module/Manage.php:143
 msgid "Create a new channel"
 msgstr "Neuen Kanal anlegen"
 
-#: ../../Zotlabs/Module/Manage.php:162 ../../include/apps.php:132
-#: ../../include/nav.php:209
+#: ../../Zotlabs/Module/Manage.php:164 ../../include/nav.php:206
+#: ../../include/apps.php:164
 msgid "Channel Manager"
 msgstr "Kanal-Manager"
 
-#: ../../Zotlabs/Module/Manage.php:163
+#: ../../Zotlabs/Module/Manage.php:165
 msgid "Current Channel"
 msgstr "Aktueller Kanal"
 
-#: ../../Zotlabs/Module/Manage.php:165
+#: ../../Zotlabs/Module/Manage.php:167
 msgid "Switch to one of your channels by selecting it."
 msgstr "Wechsle zu einem Deiner Kanäle, indem Du auf ihn klickst."
 
-#: ../../Zotlabs/Module/Manage.php:166
+#: ../../Zotlabs/Module/Manage.php:168
 msgid "Default Channel"
 msgstr "Standard Kanal"
 
-#: ../../Zotlabs/Module/Manage.php:167
+#: ../../Zotlabs/Module/Manage.php:169
 msgid "Make Default"
 msgstr "Zum Standard machen"
 
-#: ../../Zotlabs/Module/Manage.php:170
+#: ../../Zotlabs/Module/Manage.php:172
 #, php-format
 msgid "%d new messages"
 msgstr "%d neue Nachrichten"
 
-#: ../../Zotlabs/Module/Manage.php:171
+#: ../../Zotlabs/Module/Manage.php:173
 #, php-format
 msgid "%d new introductions"
 msgstr "%d neue Vorstellungen"
 
-#: ../../Zotlabs/Module/Manage.php:173
+#: ../../Zotlabs/Module/Manage.php:175
 msgid "Delegated Channel"
 msgstr "Delegierte Kanäle"
 
@@ -3687,7 +3609,7 @@ msgstr "Im Menü können gespeicherte Lesezeichen abgelegt werden"
 msgid "Submit and proceed"
 msgstr "Absenden und fortfahren"
 
-#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2279
+#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2278
 msgid "Menus"
 msgstr "Menüs"
 
@@ -3765,7 +3687,7 @@ msgid "Menu Item Permissions"
 msgstr "Zugriffsrechte des Menü-Elements"
 
 #: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:227
-#: ../../Zotlabs/Module/Settings.php:1066
+#: ../../Zotlabs/Module/Settings.php:1068
 msgid "(click to open/close)"
 msgstr "(zum öffnen/schließen anklicken)"
 
@@ -3871,7 +3793,7 @@ msgctxt "mood"
 msgid "%1$s is %2$s"
 msgstr "%1$s ist %2$s"
 
-#: ../../Zotlabs/Module/Mood.php:135 ../../include/apps.php:144
+#: ../../Zotlabs/Module/Mood.php:135 ../../include/apps.php:176
 msgid "Mood"
 msgstr "Laune"
 
@@ -3879,31 +3801,31 @@ msgstr "Laune"
 msgid "Set your current mood and tell your friends"
 msgstr "Wähle Deine aktuelle Stimmung und teile sie mit Deinen Freunden"
 
-#: ../../Zotlabs/Module/Network.php:95
+#: ../../Zotlabs/Module/Network.php:96
 msgid "No such group"
 msgstr "Gruppe nicht gefunden"
 
-#: ../../Zotlabs/Module/Network.php:135
+#: ../../Zotlabs/Module/Network.php:136
 msgid "No such channel"
 msgstr "Kanal nicht gefunden"
 
-#: ../../Zotlabs/Module/Network.php:140
+#: ../../Zotlabs/Module/Network.php:141
 msgid "forum"
 msgstr "Forum"
 
-#: ../../Zotlabs/Module/Network.php:152
+#: ../../Zotlabs/Module/Network.php:153
 msgid "Search Results For:"
 msgstr "Suchergebnisse für:"
 
-#: ../../Zotlabs/Module/Network.php:216
+#: ../../Zotlabs/Module/Network.php:217
 msgid "Privacy group is empty"
 msgstr "Gruppe ist leer"
 
-#: ../../Zotlabs/Module/Network.php:225
+#: ../../Zotlabs/Module/Network.php:226
 msgid "Privacy group: "
 msgstr "Gruppe:"
 
-#: ../../Zotlabs/Module/Network.php:251
+#: ../../Zotlabs/Module/Network.php:252
 msgid "Invalid connection."
 msgstr "Ungültige Verbindung."
 
@@ -3979,7 +3901,7 @@ msgstr "Keine System-Benachrichtigungen mehr."
 msgid "System Notifications"
 msgstr "System-Benachrichtigungen"
 
-#: ../../Zotlabs/Module/Notifications.php:103 ../../include/nav.php:194
+#: ../../Zotlabs/Module/Notifications.php:103 ../../include/nav.php:191
 msgid "Mark all system notifications seen"
 msgstr "Markiere alle System-Benachrichtigungen als gesehen"
 
@@ -4044,11 +3966,11 @@ msgstr "Modulname:"
 msgid "Layout Help"
 msgstr "Layout-Hilfe"
 
-#: ../../Zotlabs/Module/Photos.php:83
+#: ../../Zotlabs/Module/Photos.php:84
 msgid "Page owner information could not be retrieved."
 msgstr "Informationen über den Besitzer der Seite konnten nicht gefunden werden."
 
-#: ../../Zotlabs/Module/Photos.php:98 ../../Zotlabs/Module/Photos.php:742
+#: ../../Zotlabs/Module/Photos.php:99 ../../Zotlabs/Module/Photos.php:743
 #: ../../Zotlabs/Module/Profile_photo.php:114
 #: ../../Zotlabs/Module/Profile_photo.php:206
 #: ../../Zotlabs/Module/Profile_photo.php:294
@@ -4056,267 +3978,272 @@ msgstr "Informationen über den Besitzer der Seite konnten nicht gefunden werden
 msgid "Profile Photos"
 msgstr "Profilfotos"
 
-#: ../../Zotlabs/Module/Photos.php:104 ../../Zotlabs/Module/Photos.php:148
+#: ../../Zotlabs/Module/Photos.php:105 ../../Zotlabs/Module/Photos.php:149
 msgid "Album not found."
 msgstr "Album nicht gefunden."
 
-#: ../../Zotlabs/Module/Photos.php:131
+#: ../../Zotlabs/Module/Photos.php:132
 msgid "Delete Album"
 msgstr "Album löschen"
 
-#: ../../Zotlabs/Module/Photos.php:152
+#: ../../Zotlabs/Module/Photos.php:153
 msgid ""
 "Multiple storage folders exist with this album name, but within different "
 "directories. Please remove the desired folder or folders using the Files "
 "manager"
 msgstr "Mehrere Speicherordner mit diesem Albumnamen sind bereits vorhanden, aber in verschiedenen Verzeichnissen. Bitte entfernen Sie den oder die gewünschten Ordner mit dem Dateimanager"
 
-#: ../../Zotlabs/Module/Photos.php:209 ../../Zotlabs/Module/Photos.php:1052
+#: ../../Zotlabs/Module/Photos.php:210 ../../Zotlabs/Module/Photos.php:1053
 msgid "Delete Photo"
 msgstr "Foto löschen"
 
-#: ../../Zotlabs/Module/Photos.php:532
+#: ../../Zotlabs/Module/Photos.php:533
 msgid "No photos selected"
 msgstr "Keine Fotos ausgewählt"
 
-#: ../../Zotlabs/Module/Photos.php:581
+#: ../../Zotlabs/Module/Photos.php:582
 msgid "Access to this item is restricted."
 msgstr "Der Zugriff auf dieses Foto ist eingeschränkt."
 
-#: ../../Zotlabs/Module/Photos.php:620
+#: ../../Zotlabs/Module/Photos.php:621
 #, php-format
 msgid "%1$.2f MB of %2$.2f MB photo storage used."
 msgstr "%1$.2f MB von %2$.2f MB Foto-Speicher belegt."
 
-#: ../../Zotlabs/Module/Photos.php:623
+#: ../../Zotlabs/Module/Photos.php:624
 #, php-format
 msgid "%1$.2f MB photo storage used."
 msgstr "%1$.2f MB Foto-Speicher belegt."
 
-#: ../../Zotlabs/Module/Photos.php:659
+#: ../../Zotlabs/Module/Photos.php:660
 msgid "Upload Photos"
 msgstr "Fotos hochladen"
 
-#: ../../Zotlabs/Module/Photos.php:663
+#: ../../Zotlabs/Module/Photos.php:664
 msgid "Enter an album name"
 msgstr "Namen für ein neues Album eingeben"
 
-#: ../../Zotlabs/Module/Photos.php:664
+#: ../../Zotlabs/Module/Photos.php:665
 msgid "or select an existing album (doubleclick)"
 msgstr "oder ein bereits vorhandenes auswählen (Doppelklick)"
 
-#: ../../Zotlabs/Module/Photos.php:665
+#: ../../Zotlabs/Module/Photos.php:666
 msgid "Create a status post for this upload"
 msgstr "Einen Statusbeitrag für diesen Upload erzeugen"
 
-#: ../../Zotlabs/Module/Photos.php:666
+#: ../../Zotlabs/Module/Photos.php:667
 msgid "Caption (optional):"
 msgstr "Beschriftung (optional):"
 
-#: ../../Zotlabs/Module/Photos.php:667
+#: ../../Zotlabs/Module/Photos.php:668
 msgid "Description (optional):"
 msgstr "Beschreibung (optional):"
 
-#: ../../Zotlabs/Module/Photos.php:694
+#: ../../Zotlabs/Module/Photos.php:695
 msgid "Album name could not be decoded"
 msgstr "Albumname konnte nicht dekodiert werden"
 
-#: ../../Zotlabs/Module/Photos.php:742 ../../Zotlabs/Module/Photos.php:1282
-#: ../../Zotlabs/Module/Photos.php:1299
+#: ../../Zotlabs/Module/Photos.php:743 ../../Zotlabs/Module/Photos.php:1284
+#: ../../Zotlabs/Module/Photos.php:1301
 msgid "Contact Photos"
 msgstr "Kontakt-Bilder"
 
-#: ../../Zotlabs/Module/Photos.php:765
+#: ../../Zotlabs/Module/Photos.php:766
 msgid "Show Newest First"
 msgstr "Neueste zuerst anzeigen"
 
-#: ../../Zotlabs/Module/Photos.php:767
+#: ../../Zotlabs/Module/Photos.php:768
 msgid "Show Oldest First"
 msgstr "Älteste zuerst anzeigen"
 
-#: ../../Zotlabs/Module/Photos.php:791 ../../Zotlabs/Module/Photos.php:1332
-#: ../../include/widgets.php:1451
+#: ../../Zotlabs/Module/Photos.php:792 ../../Zotlabs/Module/Photos.php:1334
+#: ../../include/widgets.php:1500
 msgid "View Photo"
 msgstr "Foto ansehen"
 
-#: ../../Zotlabs/Module/Photos.php:822 ../../include/widgets.php:1468
+#: ../../Zotlabs/Module/Photos.php:823 ../../include/widgets.php:1517
 msgid "Edit Album"
 msgstr "Album bearbeiten"
 
-#: ../../Zotlabs/Module/Photos.php:869
+#: ../../Zotlabs/Module/Photos.php:870
 msgid "Permission denied. Access to this item may be restricted."
 msgstr "Berechtigung verweigert. Der Zugriff ist wahrscheinlich eingeschränkt worden."
 
-#: ../../Zotlabs/Module/Photos.php:871
+#: ../../Zotlabs/Module/Photos.php:872
 msgid "Photo not available"
 msgstr "Foto nicht verfügbar"
 
-#: ../../Zotlabs/Module/Photos.php:929
+#: ../../Zotlabs/Module/Photos.php:930
 msgid "Use as profile photo"
 msgstr "Als Profilfoto verwenden"
 
-#: ../../Zotlabs/Module/Photos.php:930
+#: ../../Zotlabs/Module/Photos.php:931
 msgid "Use as cover photo"
 msgstr "Als Titelbild verwenden"
 
-#: ../../Zotlabs/Module/Photos.php:937
+#: ../../Zotlabs/Module/Photos.php:938
 msgid "Private Photo"
 msgstr "Privates Foto"
 
-#: ../../Zotlabs/Module/Photos.php:952
+#: ../../Zotlabs/Module/Photos.php:953
 msgid "View Full Size"
 msgstr "In voller Größe anzeigen"
 
-#: ../../Zotlabs/Module/Photos.php:997 ../../Zotlabs/Module/Tagrm.php:137
-msgid "Remove"
-msgstr "Entferne"
-
-#: ../../Zotlabs/Module/Photos.php:1031
+#: ../../Zotlabs/Module/Photos.php:1032
 msgid "Edit photo"
 msgstr "Foto bearbeiten"
 
-#: ../../Zotlabs/Module/Photos.php:1033
+#: ../../Zotlabs/Module/Photos.php:1034
 msgid "Rotate CW (right)"
 msgstr "Drehen im UZS (rechts)"
 
-#: ../../Zotlabs/Module/Photos.php:1034
+#: ../../Zotlabs/Module/Photos.php:1035
 msgid "Rotate CCW (left)"
 msgstr "Drehen gegen UZS (links)"
 
-#: ../../Zotlabs/Module/Photos.php:1037
+#: ../../Zotlabs/Module/Photos.php:1038
 msgid "Enter a new album name"
 msgstr "Gib einen Namen für ein neues Album ein"
 
-#: ../../Zotlabs/Module/Photos.php:1038
+#: ../../Zotlabs/Module/Photos.php:1039
 msgid "or select an existing one (doubleclick)"
 msgstr "oder wähle ein bereits vorhandenes aus (Doppelklick)"
 
-#: ../../Zotlabs/Module/Photos.php:1041
+#: ../../Zotlabs/Module/Photos.php:1042
 msgid "Caption"
 msgstr "Bildunterschrift"
 
-#: ../../Zotlabs/Module/Photos.php:1043
+#: ../../Zotlabs/Module/Photos.php:1044
 msgid "Add a Tag"
 msgstr "Schlagwort hinzufügen"
 
-#: ../../Zotlabs/Module/Photos.php:1047
+#: ../../Zotlabs/Module/Photos.php:1048
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
 msgstr "Beispiele: @ben, @Karl_Prester, @lieschen@example.com"
 
-#: ../../Zotlabs/Module/Photos.php:1050
+#: ../../Zotlabs/Module/Photos.php:1051
 msgid "Flag as adult in album view"
 msgstr "In der Albumansicht als nicht jugendfrei markieren"
 
-#: ../../Zotlabs/Module/Photos.php:1069 ../../include/ItemObject.php:254
+#: ../../Zotlabs/Module/Photos.php:1070 ../../include/ItemObject.php:254
 msgid "I like this (toggle)"
 msgstr "Mir gefällt das (Umschalter)"
 
-#: ../../Zotlabs/Module/Photos.php:1070 ../../include/ItemObject.php:255
+#: ../../Zotlabs/Module/Photos.php:1071 ../../include/ItemObject.php:255
 msgid "I don't like this (toggle)"
 msgstr "Mir gefällt das nicht (Umschalter)"
 
-#: ../../Zotlabs/Module/Photos.php:1088 ../../Zotlabs/Module/Photos.php:1206
+#: ../../Zotlabs/Module/Photos.php:1073 ../../include/ItemObject.php:389
+#: ../../include/conversation.php:740
+msgid "Please wait"
+msgstr "Bitte warten"
+
+#: ../../Zotlabs/Module/Photos.php:1089 ../../Zotlabs/Module/Photos.php:1207
 #: ../../include/ItemObject.php:700
 msgid "This is you"
 msgstr "Das bist Du"
 
-#: ../../Zotlabs/Module/Photos.php:1090 ../../Zotlabs/Module/Photos.php:1208
+#: ../../Zotlabs/Module/Photos.php:1091 ../../Zotlabs/Module/Photos.php:1209
 #: ../../include/ItemObject.php:702 ../../include/js_strings.php:6
 msgid "Comment"
 msgstr "Kommentar"
 
-#: ../../Zotlabs/Module/Photos.php:1106 ../../include/conversation.php:574
+#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:574
 msgctxt "title"
 msgid "Likes"
 msgstr "Gefällt mir"
 
-#: ../../Zotlabs/Module/Photos.php:1106 ../../include/conversation.php:574
+#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:574
 msgctxt "title"
 msgid "Dislikes"
 msgstr "Gefällt mir nicht"
 
-#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:575
+#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:575
 msgctxt "title"
 msgid "Agree"
 msgstr "Zustimmungen"
 
-#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:575
+#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:575
 msgctxt "title"
 msgid "Disagree"
 msgstr "Ablehnungen"
 
-#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:575
+#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:575
 msgctxt "title"
 msgid "Abstain"
 msgstr "Enthaltungen"
 
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:576
+#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:576
 msgctxt "title"
 msgid "Attending"
 msgstr "Zusagen"
 
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:576
+#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:576
 msgctxt "title"
 msgid "Not attending"
 msgstr "Absagen"
 
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:576
+#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:576
 msgctxt "title"
 msgid "Might attend"
 msgstr "Vielleicht"
 
-#: ../../Zotlabs/Module/Photos.php:1125 ../../Zotlabs/Module/Photos.php:1137
+#: ../../Zotlabs/Module/Photos.php:1126 ../../Zotlabs/Module/Photos.php:1138
 #: ../../include/ItemObject.php:175 ../../include/ItemObject.php:187
-#: ../../include/conversation.php:1736
+#: ../../include/conversation.php:1724
 msgid "View all"
 msgstr "Alles anzeigen"
 
-#: ../../Zotlabs/Module/Photos.php:1129 ../../include/identity.php:1297
-#: ../../include/ItemObject.php:179 ../../include/conversation.php:1760
-#: ../../include/taxonomy.php:415
+#: ../../Zotlabs/Module/Photos.php:1130 ../../include/identity.php:1304
+#: ../../include/ItemObject.php:179 ../../include/conversation.php:1748
+#: ../../include/taxonomy.php:403
 msgctxt "noun"
 msgid "Like"
 msgid_plural "Likes"
 msgstr[0] "Gefällt mir"
 msgstr[1] "Gefällt mir"
 
-#: ../../Zotlabs/Module/Photos.php:1134 ../../include/ItemObject.php:184
-#: ../../include/conversation.php:1763
+#: ../../Zotlabs/Module/Photos.php:1135 ../../include/ItemObject.php:184
+#: ../../include/conversation.php:1751
 msgctxt "noun"
 msgid "Dislike"
 msgid_plural "Dislikes"
 msgstr[0] "Gefällt nicht"
 msgstr[1] "Gefällt nicht"
 
-#: ../../Zotlabs/Module/Photos.php:1242
+#: ../../Zotlabs/Module/Photos.php:1235
+msgid "Photo Tools"
+msgstr "Fotowerkzeuge"
+
+#: ../../Zotlabs/Module/Photos.php:1244
 msgid "In This Photo:"
 msgstr "Auf diesem Foto:"
 
-#: ../../Zotlabs/Module/Photos.php:1247
+#: ../../Zotlabs/Module/Photos.php:1249
 msgid "Map"
 msgstr "Karte"
 
-#: ../../Zotlabs/Module/Photos.php:1255 ../../include/ItemObject.php:378
+#: ../../Zotlabs/Module/Photos.php:1257 ../../include/ItemObject.php:378
 msgctxt "noun"
 msgid "Likes"
 msgstr "Gefällt mir"
 
-#: ../../Zotlabs/Module/Photos.php:1256 ../../include/ItemObject.php:379
+#: ../../Zotlabs/Module/Photos.php:1258 ../../include/ItemObject.php:379
 msgctxt "noun"
 msgid "Dislikes"
 msgstr "Gefällt nicht"
 
-#: ../../Zotlabs/Module/Photos.php:1261 ../../include/ItemObject.php:384
-#: ../../include/acl_selectors.php:252
+#: ../../Zotlabs/Module/Photos.php:1263 ../../include/acl_selectors.php:287
+#: ../../include/ItemObject.php:384
 msgid "Close"
 msgstr "Schließen"
 
-#: ../../Zotlabs/Module/Photos.php:1338
+#: ../../Zotlabs/Module/Photos.php:1340
 msgid "View Album"
 msgstr "Album ansehen"
 
-#: ../../Zotlabs/Module/Photos.php:1349 ../../Zotlabs/Module/Photos.php:1362
-#: ../../Zotlabs/Module/Photos.php:1363
+#: ../../Zotlabs/Module/Photos.php:1351 ../../Zotlabs/Module/Photos.php:1364
+#: ../../Zotlabs/Module/Photos.php:1365
 msgid "Recent Photos"
 msgstr "Neueste Fotos"
 
@@ -4328,13 +4255,13 @@ msgstr "hat Dir eine private Nachricht geschickt"
 msgid "added your channel"
 msgstr "hat deinen Kanal hinzugefügt"
 
-#: ../../Zotlabs/Module/Ping.php:322 ../../include/identity.php:1116
-#: ../../include/identity.php:1192
+#: ../../Zotlabs/Module/Ping.php:322 ../../include/identity.php:1123
+#: ../../include/identity.php:1199
 msgid "g A l F d"
 msgstr "l, d. F, G:i \\U\\h\\r"
 
-#: ../../Zotlabs/Module/Ping.php:345 ../../include/identity.php:1162
-#: ../../include/identity.php:1232
+#: ../../Zotlabs/Module/Ping.php:345 ../../include/identity.php:1169
+#: ../../include/identity.php:1239
 msgid "[today]"
 msgstr "[Heute]"
 
@@ -4342,8 +4269,8 @@ msgstr "[Heute]"
 msgid "posted an event"
 msgstr "hat einen Termin veröffentlicht"
 
-#: ../../Zotlabs/Module/Poke.php:168 ../../include/apps.php:145
-#: ../../include/conversation.php:965
+#: ../../Zotlabs/Module/Poke.php:168 ../../include/conversation.php:965
+#: ../../include/apps.php:177
 msgid "Poke"
 msgstr "Anstupsen"
 
@@ -4423,15 +4350,15 @@ msgstr "Familienstand"
 msgid "Romantic Partner"
 msgstr "Romantische Partner"
 
-#: ../../Zotlabs/Module/Profiles.php:434 ../../Zotlabs/Module/Profiles.php:739
+#: ../../Zotlabs/Module/Profiles.php:434 ../../Zotlabs/Module/Profiles.php:740
 msgid "Likes"
 msgstr "Gefällt"
 
-#: ../../Zotlabs/Module/Profiles.php:438 ../../Zotlabs/Module/Profiles.php:740
+#: ../../Zotlabs/Module/Profiles.php:438 ../../Zotlabs/Module/Profiles.php:741
 msgid "Dislikes"
 msgstr "Gefällt nicht"
 
-#: ../../Zotlabs/Module/Profiles.php:442 ../../Zotlabs/Module/Profiles.php:747
+#: ../../Zotlabs/Module/Profiles.php:442 ../../Zotlabs/Module/Profiles.php:748
 msgid "Work/Employment"
 msgstr "Arbeit/Anstellung"
 
@@ -4471,181 +4398,185 @@ msgstr "Bearbeite Profil-Details"
 msgid "View this profile"
 msgstr "Dieses Profil ansehen"
 
-#: ../../Zotlabs/Module/Profiles.php:693 ../../Zotlabs/Module/Profiles.php:774
-#: ../../include/identity.php:952
+#: ../../Zotlabs/Module/Profiles.php:693 ../../Zotlabs/Module/Profiles.php:775
+#: ../../include/identity.php:959
 msgid "Edit visibility"
 msgstr "Sichtbarkeit bearbeiten"
 
 #: ../../Zotlabs/Module/Profiles.php:694
+msgid "Profile Tools"
+msgstr "Profilwerkzeuge"
+
+#: ../../Zotlabs/Module/Profiles.php:695
 msgid "Change cover photo"
 msgstr "Titelbild ändern"
 
-#: ../../Zotlabs/Module/Profiles.php:695 ../../include/identity.php:923
+#: ../../Zotlabs/Module/Profiles.php:696 ../../include/identity.php:930
 msgid "Change profile photo"
 msgstr "Profilfoto ändern"
 
-#: ../../Zotlabs/Module/Profiles.php:696
+#: ../../Zotlabs/Module/Profiles.php:697
 msgid "Create a new profile using these settings"
 msgstr "Neues Profil anlegen und diese Einstellungen übernehmen"
 
-#: ../../Zotlabs/Module/Profiles.php:697
+#: ../../Zotlabs/Module/Profiles.php:698
 msgid "Clone this profile"
 msgstr "Dieses Profil klonen"
 
-#: ../../Zotlabs/Module/Profiles.php:698
+#: ../../Zotlabs/Module/Profiles.php:699
 msgid "Delete this profile"
 msgstr "Dieses Profil löschen"
 
-#: ../../Zotlabs/Module/Profiles.php:699
+#: ../../Zotlabs/Module/Profiles.php:700
 msgid "Add profile things"
 msgstr "Sachen zum Profil hinzufügen"
 
-#: ../../Zotlabs/Module/Profiles.php:700 ../../include/conversation.php:1544
-#: ../../include/widgets.php:105
+#: ../../Zotlabs/Module/Profiles.php:701 ../../include/widgets.php:105
+#: ../../include/conversation.php:1532
 msgid "Personal"
 msgstr "Persönlich"
 
-#: ../../Zotlabs/Module/Profiles.php:702
+#: ../../Zotlabs/Module/Profiles.php:703
 msgid "Relation"
 msgstr "Beziehung"
 
-#: ../../Zotlabs/Module/Profiles.php:703 ../../include/datetime.php:48
+#: ../../Zotlabs/Module/Profiles.php:704 ../../include/datetime.php:48
 msgid "Miscellaneous"
 msgstr "Verschiedenes"
 
-#: ../../Zotlabs/Module/Profiles.php:705
+#: ../../Zotlabs/Module/Profiles.php:706
 msgid "Import profile from file"
 msgstr "Profil aus einer Datei importieren"
 
-#: ../../Zotlabs/Module/Profiles.php:706
+#: ../../Zotlabs/Module/Profiles.php:707
 msgid "Export profile to file"
 msgstr "Profil in eine Datei exportieren"
 
-#: ../../Zotlabs/Module/Profiles.php:707
+#: ../../Zotlabs/Module/Profiles.php:708
 msgid "Your gender"
 msgstr "Dein Geschlecht"
 
-#: ../../Zotlabs/Module/Profiles.php:708
+#: ../../Zotlabs/Module/Profiles.php:709
 msgid "Marital status"
 msgstr "Familienstand"
 
-#: ../../Zotlabs/Module/Profiles.php:709
+#: ../../Zotlabs/Module/Profiles.php:710
 msgid "Sexual preference"
 msgstr "Sexuelle Orientierung"
 
-#: ../../Zotlabs/Module/Profiles.php:712
+#: ../../Zotlabs/Module/Profiles.php:713
 msgid "Profile name"
 msgstr "Profilname"
 
-#: ../../Zotlabs/Module/Profiles.php:714
+#: ../../Zotlabs/Module/Profiles.php:715
 msgid "This is your default profile."
 msgstr "Das ist Dein Standardprofil."
 
-#: ../../Zotlabs/Module/Profiles.php:716
+#: ../../Zotlabs/Module/Profiles.php:717
 msgid "Your full name"
 msgstr "Dein voller Name"
 
-#: ../../Zotlabs/Module/Profiles.php:717
+#: ../../Zotlabs/Module/Profiles.php:718
 msgid "Title/Description"
 msgstr "Titel/Beschreibung"
 
-#: ../../Zotlabs/Module/Profiles.php:720
+#: ../../Zotlabs/Module/Profiles.php:721
 msgid "Street address"
 msgstr "Straße und Hausnummer"
 
-#: ../../Zotlabs/Module/Profiles.php:721
+#: ../../Zotlabs/Module/Profiles.php:722
 msgid "Locality/City"
 msgstr "Wohnort"
 
-#: ../../Zotlabs/Module/Profiles.php:722
+#: ../../Zotlabs/Module/Profiles.php:723
 msgid "Region/State"
 msgstr "Region/Bundesstaat"
 
-#: ../../Zotlabs/Module/Profiles.php:723
+#: ../../Zotlabs/Module/Profiles.php:724
 msgid "Postal/Zip code"
 msgstr "Postleitzahl"
 
-#: ../../Zotlabs/Module/Profiles.php:724
+#: ../../Zotlabs/Module/Profiles.php:725
 msgid "Country"
 msgstr "Land"
 
-#: ../../Zotlabs/Module/Profiles.php:729
+#: ../../Zotlabs/Module/Profiles.php:730
 msgid "Who (if applicable)"
 msgstr "Wer (falls anwendbar)"
 
-#: ../../Zotlabs/Module/Profiles.php:729
+#: ../../Zotlabs/Module/Profiles.php:730
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr "Beispiele: cathy123, Cathy Williams, cathy@example.com"
 
-#: ../../Zotlabs/Module/Profiles.php:730
+#: ../../Zotlabs/Module/Profiles.php:731
 msgid "Since (date)"
 msgstr "Seit (Datum)"
 
-#: ../../Zotlabs/Module/Profiles.php:733
+#: ../../Zotlabs/Module/Profiles.php:734
 msgid "Tell us about yourself"
 msgstr "Erzähle uns ein wenig von Dir"
 
-#: ../../Zotlabs/Module/Profiles.php:735
+#: ../../Zotlabs/Module/Profiles.php:736
 msgid "Hometown"
 msgstr "Heimatort"
 
-#: ../../Zotlabs/Module/Profiles.php:736
+#: ../../Zotlabs/Module/Profiles.php:737
 msgid "Political views"
 msgstr "Politische Ansichten"
 
-#: ../../Zotlabs/Module/Profiles.php:737
+#: ../../Zotlabs/Module/Profiles.php:738
 msgid "Religious views"
 msgstr "Religiöse Ansichten"
 
-#: ../../Zotlabs/Module/Profiles.php:738
+#: ../../Zotlabs/Module/Profiles.php:739
 msgid "Keywords used in directory listings"
 msgstr "Schlüsselwörter, die in Verzeichnis-Auflistungen verwendet werden"
 
-#: ../../Zotlabs/Module/Profiles.php:738
+#: ../../Zotlabs/Module/Profiles.php:739
 msgid "Example: fishing photography software"
 msgstr "Beispiel: Angeln Fotografie Software"
 
-#: ../../Zotlabs/Module/Profiles.php:741
+#: ../../Zotlabs/Module/Profiles.php:742
 msgid "Musical interests"
 msgstr "Musikalische Interessen"
 
-#: ../../Zotlabs/Module/Profiles.php:742
+#: ../../Zotlabs/Module/Profiles.php:743
 msgid "Books, literature"
 msgstr "Bücher, Literatur"
 
-#: ../../Zotlabs/Module/Profiles.php:743
+#: ../../Zotlabs/Module/Profiles.php:744
 msgid "Television"
 msgstr "Fernsehen"
 
-#: ../../Zotlabs/Module/Profiles.php:744
+#: ../../Zotlabs/Module/Profiles.php:745
 msgid "Film/Dance/Culture/Entertainment"
 msgstr "Film/Tanz/Kultur/Unterhaltung"
 
-#: ../../Zotlabs/Module/Profiles.php:745
+#: ../../Zotlabs/Module/Profiles.php:746
 msgid "Hobbies/Interests"
 msgstr "Hobbys/Interessen"
 
-#: ../../Zotlabs/Module/Profiles.php:746
+#: ../../Zotlabs/Module/Profiles.php:747
 msgid "Love/Romance"
 msgstr "Liebe/Romantik"
 
-#: ../../Zotlabs/Module/Profiles.php:748
+#: ../../Zotlabs/Module/Profiles.php:749
 msgid "School/Education"
 msgstr "Schule/Ausbildung"
 
-#: ../../Zotlabs/Module/Profiles.php:749
+#: ../../Zotlabs/Module/Profiles.php:750
 msgid "Contact information and social networks"
 msgstr "Kontaktinformation und soziale Netzwerke"
 
-#: ../../Zotlabs/Module/Profiles.php:750
+#: ../../Zotlabs/Module/Profiles.php:751
 msgid "My other channels"
 msgstr "Meine anderen Kanäle"
 
-#: ../../Zotlabs/Module/Profiles.php:770 ../../include/identity.php:948
+#: ../../Zotlabs/Module/Profiles.php:771 ../../include/identity.php:955
 msgid "Profile Image"
 msgstr "Profilfoto:"
 
-#: ../../Zotlabs/Module/Profiles.php:780 ../../include/identity.php:930
+#: ../../Zotlabs/Module/Profiles.php:781 ../../include/identity.php:937
 #: ../../include/nav.php:88
 msgid "Edit Profiles"
 msgstr "Profile bearbeiten"
@@ -4658,8 +4589,7 @@ msgstr "Ungültiger Profil-Identifikator"
 msgid "Profile Visibility Editor"
 msgstr "Profil-Sichtbarkeits-Editor"
 
-#: ../../Zotlabs/Module/Profperm.php:117 ../../include/identity.php:1388
-#: ../../include/apps.php:138
+#: ../../Zotlabs/Module/Profperm.php:117 ../../include/identity.php:1395
 msgid "Profile"
 msgstr "Profil"
 
@@ -4671,7 +4601,7 @@ msgstr "Klicke auf einen Kontakt, um ihn hinzuzufügen oder zu entfernen."
 msgid "Visible To"
 msgstr "Sichtbar für"
 
-#: ../../Zotlabs/Module/Pubsites.php:22 ../../include/widgets.php:1222
+#: ../../Zotlabs/Module/Pubsites.php:22 ../../include/widgets.php:1271
 msgid "Public Hubs"
 msgstr "Öffentliche Hubs"
 
@@ -4841,8 +4771,8 @@ msgstr "ja"
 msgid "Membership on this site is by invitation only."
 msgstr "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich."
 
-#: ../../Zotlabs/Module/Register.php:262 ../../include/nav.php:148
-#: ../../boot.php:1584
+#: ../../Zotlabs/Module/Register.php:262 ../../include/nav.php:147
+#: ../../boot.php:1597
 msgid "Register"
 msgstr "Registrieren"
 
@@ -4898,7 +4828,7 @@ msgid ""
 msgstr "Standardmäßig werden nur die Kanalklone auf diesem $Projectname-Hub aus dem Netzwerk entfernt"
 
 #: ../../Zotlabs/Module/Removeaccount.php:65
-#: ../../Zotlabs/Module/Settings.php:703
+#: ../../Zotlabs/Module/Settings.php:705
 msgid "Remove Account"
 msgstr "Konto entfernen"
 
@@ -4926,7 +4856,7 @@ msgid ""
 "removed from the network"
 msgstr "Standardmäßig wird der Kanal nur auf diesem Server gelöscht, seine Klone verbleiben im Netzwerk"
 
-#: ../../Zotlabs/Module/Removeme.php:65 ../../Zotlabs/Module/Settings.php:1122
+#: ../../Zotlabs/Module/Removeme.php:65 ../../Zotlabs/Module/Settings.php:1124
 msgid "Remove Channel"
 msgstr "Kanal löschen"
 
@@ -4970,598 +4900,598 @@ msgstr "Suchergebnisse für: %s"
 msgid "No service class restrictions found."
 msgstr "Keine Dienstklassenbeschränkungen gefunden."
 
-#: ../../Zotlabs/Module/Settings.php:67
+#: ../../Zotlabs/Module/Settings.php:69
 msgid "Name is required"
 msgstr "Name ist erforderlich"
 
-#: ../../Zotlabs/Module/Settings.php:71
+#: ../../Zotlabs/Module/Settings.php:73
 msgid "Key and Secret are required"
 msgstr "Schlüssel und Geheimnis werden benötigt"
 
-#: ../../Zotlabs/Module/Settings.php:75 ../../Zotlabs/Module/Settings.php:614
-#: ../../include/apps.php:252
-msgid "Update"
-msgstr "Aktualisieren"
-
-#: ../../Zotlabs/Module/Settings.php:223
+#: ../../Zotlabs/Module/Settings.php:225
 msgid "Not valid email."
 msgstr "Keine gültige E-Mail Adresse."
 
-#: ../../Zotlabs/Module/Settings.php:226
+#: ../../Zotlabs/Module/Settings.php:228
 msgid "Protected email address. Cannot change to that email."
 msgstr "Geschützte E-Mail Adresse. Diese kann nicht verändert werden."
 
-#: ../../Zotlabs/Module/Settings.php:235
+#: ../../Zotlabs/Module/Settings.php:237
 msgid "System failure storing new email. Please try again."
 msgstr "Systemfehler während des Speicherns der neuen Mail. Bitte versuche es noch einmal."
 
-#: ../../Zotlabs/Module/Settings.php:252
+#: ../../Zotlabs/Module/Settings.php:254
 msgid "Password verification failed."
 msgstr "Passwortüberprüfung fehlgeschlagen."
 
-#: ../../Zotlabs/Module/Settings.php:259
+#: ../../Zotlabs/Module/Settings.php:261
 msgid "Passwords do not match. Password unchanged."
 msgstr "Kennwörter stimmen nicht überein. Kennwort nicht verändert."
 
-#: ../../Zotlabs/Module/Settings.php:263
+#: ../../Zotlabs/Module/Settings.php:265
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr "Leere Kennwörter sind nicht erlaubt. Kennwort nicht verändert."
 
-#: ../../Zotlabs/Module/Settings.php:277
+#: ../../Zotlabs/Module/Settings.php:279
 msgid "Password changed."
 msgstr "Kennwort geändert."
 
-#: ../../Zotlabs/Module/Settings.php:279
+#: ../../Zotlabs/Module/Settings.php:281
 msgid "Password update failed. Please try again."
 msgstr "Kennwortänderung fehlgeschlagen. Bitte versuche es noch einmal."
 
-#: ../../Zotlabs/Module/Settings.php:523
+#: ../../Zotlabs/Module/Settings.php:525
 msgid "Settings updated."
 msgstr "Einstellungen aktualisiert."
 
-#: ../../Zotlabs/Module/Settings.php:587 ../../Zotlabs/Module/Settings.php:613
-#: ../../Zotlabs/Module/Settings.php:649
+#: ../../Zotlabs/Module/Settings.php:589 ../../Zotlabs/Module/Settings.php:615
+#: ../../Zotlabs/Module/Settings.php:651
 msgid "Add application"
 msgstr "Anwendung hinzufügen"
 
-#: ../../Zotlabs/Module/Settings.php:590
+#: ../../Zotlabs/Module/Settings.php:592
 msgid "Name of application"
 msgstr "Name der Anwendung"
 
-#: ../../Zotlabs/Module/Settings.php:591 ../../Zotlabs/Module/Settings.php:617
+#: ../../Zotlabs/Module/Settings.php:593 ../../Zotlabs/Module/Settings.php:619
 msgid "Consumer Key"
 msgstr "Consumer Key"
 
-#: ../../Zotlabs/Module/Settings.php:591 ../../Zotlabs/Module/Settings.php:592
+#: ../../Zotlabs/Module/Settings.php:593 ../../Zotlabs/Module/Settings.php:594
 msgid "Automatically generated - change if desired. Max length 20"
 msgstr "Automatisch erzeugt – ändern, falls erwünscht. Maximale Länge 20"
 
-#: ../../Zotlabs/Module/Settings.php:592 ../../Zotlabs/Module/Settings.php:618
+#: ../../Zotlabs/Module/Settings.php:594 ../../Zotlabs/Module/Settings.php:620
 msgid "Consumer Secret"
 msgstr "Consumer Secret"
 
-#: ../../Zotlabs/Module/Settings.php:593 ../../Zotlabs/Module/Settings.php:619
+#: ../../Zotlabs/Module/Settings.php:595 ../../Zotlabs/Module/Settings.php:621
 msgid "Redirect"
 msgstr "Umleitung"
 
-#: ../../Zotlabs/Module/Settings.php:593
+#: ../../Zotlabs/Module/Settings.php:595
 msgid ""
 "Redirect URI - leave blank unless your application specifically requires "
 "this"
 msgstr "Umleitungs-URl – lasse das leer, solange Deine Anwendung es nicht explizit erfordert"
 
-#: ../../Zotlabs/Module/Settings.php:594 ../../Zotlabs/Module/Settings.php:620
+#: ../../Zotlabs/Module/Settings.php:596 ../../Zotlabs/Module/Settings.php:622
 msgid "Icon url"
 msgstr "Symbol-URL"
 
-#: ../../Zotlabs/Module/Settings.php:594
+#: ../../Zotlabs/Module/Settings.php:596 ../../Zotlabs/Module/Sources.php:112
+#: ../../Zotlabs/Module/Sources.php:147
 msgid "Optional"
 msgstr "Optional"
 
-#: ../../Zotlabs/Module/Settings.php:605
+#: ../../Zotlabs/Module/Settings.php:607
 msgid "Application not found."
 msgstr "Die Anwendung wurde nicht gefunden."
 
-#: ../../Zotlabs/Module/Settings.php:648
+#: ../../Zotlabs/Module/Settings.php:650
 msgid "Connected Apps"
 msgstr "Verbundene Apps"
 
-#: ../../Zotlabs/Module/Settings.php:652
+#: ../../Zotlabs/Module/Settings.php:654
 msgid "Client key starts with"
 msgstr "Client Key beginnt mit"
 
-#: ../../Zotlabs/Module/Settings.php:653
+#: ../../Zotlabs/Module/Settings.php:655
 msgid "No name"
 msgstr "Kein Name"
 
-#: ../../Zotlabs/Module/Settings.php:654
+#: ../../Zotlabs/Module/Settings.php:656
 msgid "Remove authorization"
 msgstr "Authorisierung aufheben"
 
-#: ../../Zotlabs/Module/Settings.php:667
+#: ../../Zotlabs/Module/Settings.php:669
 msgid "No feature settings configured"
 msgstr "Keine Funktions-Einstellungen konfiguriert"
 
-#: ../../Zotlabs/Module/Settings.php:674
+#: ../../Zotlabs/Module/Settings.php:676
 msgid "Feature/Addon Settings"
 msgstr "Funktions-/Addon-Einstellungen"
 
-#: ../../Zotlabs/Module/Settings.php:697
+#: ../../Zotlabs/Module/Settings.php:699
 msgid "Account Settings"
 msgstr "Konto-Einstellungen"
 
-#: ../../Zotlabs/Module/Settings.php:698
+#: ../../Zotlabs/Module/Settings.php:700
 msgid "Current Password"
 msgstr "Aktuelles Passwort"
 
-#: ../../Zotlabs/Module/Settings.php:699
+#: ../../Zotlabs/Module/Settings.php:701
 msgid "Enter New Password"
 msgstr "Gib ein neues Passwort ein"
 
-#: ../../Zotlabs/Module/Settings.php:700
+#: ../../Zotlabs/Module/Settings.php:702
 msgid "Confirm New Password"
 msgstr "Bestätige das neue Passwort"
 
-#: ../../Zotlabs/Module/Settings.php:700
+#: ../../Zotlabs/Module/Settings.php:702
 msgid "Leave password fields blank unless changing"
 msgstr "Lasse die Passwort-Felder leer, außer Du möchtest das Passwort ändern"
 
-#: ../../Zotlabs/Module/Settings.php:702
-#: ../../Zotlabs/Module/Settings.php:1039
+#: ../../Zotlabs/Module/Settings.php:704
+#: ../../Zotlabs/Module/Settings.php:1041
 msgid "Email Address:"
 msgstr "Email Adresse:"
 
-#: ../../Zotlabs/Module/Settings.php:704
+#: ../../Zotlabs/Module/Settings.php:706
 msgid "Remove this account including all its channels"
 msgstr "Dieses Konto inklusive all seiner Kanäle löschen"
 
-#: ../../Zotlabs/Module/Settings.php:727
+#: ../../Zotlabs/Module/Settings.php:729
 msgid "Additional Features"
 msgstr "Zusätzliche Funktionen"
 
-#: ../../Zotlabs/Module/Settings.php:751
+#: ../../Zotlabs/Module/Settings.php:753
 msgid "Connector Settings"
 msgstr "Connector-Einstellungen"
 
-#: ../../Zotlabs/Module/Settings.php:790
+#: ../../Zotlabs/Module/Settings.php:792
 msgid "No special theme for mobile devices"
 msgstr "Keine spezielle Theme für mobile Geräte"
 
-#: ../../Zotlabs/Module/Settings.php:793
+#: ../../Zotlabs/Module/Settings.php:795
 #, php-format
 msgid "%s - (Experimental)"
 msgstr "%s – (experimentell)"
 
-#: ../../Zotlabs/Module/Settings.php:835
+#: ../../Zotlabs/Module/Settings.php:837
 msgid "Display Settings"
 msgstr "Anzeige-Einstellungen"
 
-#: ../../Zotlabs/Module/Settings.php:836
+#: ../../Zotlabs/Module/Settings.php:838
 msgid "Theme Settings"
 msgstr "Theme-Einstellungen"
 
-#: ../../Zotlabs/Module/Settings.php:837
+#: ../../Zotlabs/Module/Settings.php:839
 msgid "Custom Theme Settings"
 msgstr "Benutzerdefinierte Theme-Einstellungen"
 
-#: ../../Zotlabs/Module/Settings.php:838
+#: ../../Zotlabs/Module/Settings.php:840
 msgid "Content Settings"
 msgstr "Inhaltseinstellungen"
 
-#: ../../Zotlabs/Module/Settings.php:844
+#: ../../Zotlabs/Module/Settings.php:846
 msgid "Display Theme:"
 msgstr "Anzeige-Theme:"
 
-#: ../../Zotlabs/Module/Settings.php:845
+#: ../../Zotlabs/Module/Settings.php:847
 msgid "Mobile Theme:"
 msgstr "Mobile Theme:"
 
-#: ../../Zotlabs/Module/Settings.php:846
+#: ../../Zotlabs/Module/Settings.php:848
 msgid "Preload images before rendering the page"
 msgstr "Bilder im voraus laden, bevor die Seite angezeigt wird"
 
-#: ../../Zotlabs/Module/Settings.php:846
+#: ../../Zotlabs/Module/Settings.php:848
 msgid ""
 "The subjective page load time will be longer but the page will be ready when"
 " displayed"
 msgstr "Die empfundene Ladezeit wird sich erhöhen, aber dafür ist das Layout stabil, sobald eine Seite angezeigt wird"
 
-#: ../../Zotlabs/Module/Settings.php:847
+#: ../../Zotlabs/Module/Settings.php:849
 msgid "Enable user zoom on mobile devices"
 msgstr "Zoom auf Mobilgeräten aktivieren"
 
-#: ../../Zotlabs/Module/Settings.php:848
+#: ../../Zotlabs/Module/Settings.php:850
 msgid "Update browser every xx seconds"
 msgstr "Browser alle xx Sekunden aktualisieren"
 
-#: ../../Zotlabs/Module/Settings.php:848
+#: ../../Zotlabs/Module/Settings.php:850
 msgid "Minimum of 10 seconds, no maximum"
 msgstr "Minimum 10 Sekunden, kein Maximum"
 
-#: ../../Zotlabs/Module/Settings.php:849
+#: ../../Zotlabs/Module/Settings.php:851
 msgid "Maximum number of conversations to load at any time:"
 msgstr "Maximale Anzahl von Unterhaltungen, die auf einmal geladen werden sollen:"
 
-#: ../../Zotlabs/Module/Settings.php:849
+#: ../../Zotlabs/Module/Settings.php:851
 msgid "Maximum of 100 items"
 msgstr "Maximum: 100 Beiträge"
 
-#: ../../Zotlabs/Module/Settings.php:850
+#: ../../Zotlabs/Module/Settings.php:852
 msgid "Show emoticons (smilies) as images"
 msgstr "Emoticons (Smilies) als Bilder anzeigen"
 
-#: ../../Zotlabs/Module/Settings.php:851
+#: ../../Zotlabs/Module/Settings.php:853
 msgid "Link post titles to source"
 msgstr "Beitragstitel zum Originalbeitrag verlinken"
 
-#: ../../Zotlabs/Module/Settings.php:852
+#: ../../Zotlabs/Module/Settings.php:854
 msgid "System Page Layout Editor - (advanced)"
 msgstr "System-Seitenlayout-Editor (für Experten)"
 
-#: ../../Zotlabs/Module/Settings.php:855
+#: ../../Zotlabs/Module/Settings.php:857
 msgid "Use blog/list mode on channel page"
 msgstr "Blog-/Listenmodus auf der Kanalseite verwenden"
 
-#: ../../Zotlabs/Module/Settings.php:855 ../../Zotlabs/Module/Settings.php:856
+#: ../../Zotlabs/Module/Settings.php:857 ../../Zotlabs/Module/Settings.php:858
 msgid "(comments displayed separately)"
 msgstr "(Kommentare werden separat angezeigt)"
 
-#: ../../Zotlabs/Module/Settings.php:856
+#: ../../Zotlabs/Module/Settings.php:858
 msgid "Use blog/list mode on grid page"
 msgstr "Blog-/Listenmodus auf der Netzwerkseite verwenden"
 
-#: ../../Zotlabs/Module/Settings.php:857
+#: ../../Zotlabs/Module/Settings.php:859
 msgid "Channel page max height of content (in pixels)"
 msgstr "Maximale Höhe von Beitragsblöcken auf der Kanalseite (in Pixeln)"
 
-#: ../../Zotlabs/Module/Settings.php:857 ../../Zotlabs/Module/Settings.php:858
+#: ../../Zotlabs/Module/Settings.php:859 ../../Zotlabs/Module/Settings.php:860
 msgid "click to expand content exceeding this height"
 msgstr "Blöcke, deren Inhalt diese Höhe überschreitet, können per Klick vergrößert werden."
 
-#: ../../Zotlabs/Module/Settings.php:858
+#: ../../Zotlabs/Module/Settings.php:860
 msgid "Grid page max height of content (in pixels)"
 msgstr "Maximale Höhe (in Pixel) des Inhalts der Netzwerkseite"
 
-#: ../../Zotlabs/Module/Settings.php:892
+#: ../../Zotlabs/Module/Settings.php:894
 msgid "Nobody except yourself"
 msgstr "Niemand außer Dir selbst"
 
-#: ../../Zotlabs/Module/Settings.php:893
+#: ../../Zotlabs/Module/Settings.php:895
 msgid "Only those you specifically allow"
 msgstr "Nur die, denen Du es explizit erlaubst"
 
-#: ../../Zotlabs/Module/Settings.php:894
+#: ../../Zotlabs/Module/Settings.php:896
 msgid "Approved connections"
 msgstr "Angenommene Verbindungen"
 
-#: ../../Zotlabs/Module/Settings.php:895
+#: ../../Zotlabs/Module/Settings.php:897
 msgid "Any connections"
 msgstr "Beliebige Verbindungen"
 
-#: ../../Zotlabs/Module/Settings.php:896
+#: ../../Zotlabs/Module/Settings.php:898
 msgid "Anybody on this website"
 msgstr "Jeder auf dieser Website"
 
-#: ../../Zotlabs/Module/Settings.php:897
+#: ../../Zotlabs/Module/Settings.php:899
 msgid "Anybody in this network"
 msgstr "Alle $Projectname-Mitglieder"
 
-#: ../../Zotlabs/Module/Settings.php:898
+#: ../../Zotlabs/Module/Settings.php:900
 msgid "Anybody authenticated"
 msgstr "Jeder authentifizierte"
 
-#: ../../Zotlabs/Module/Settings.php:899
+#: ../../Zotlabs/Module/Settings.php:901
 msgid "Anybody on the internet"
 msgstr "Jeder im Internet"
 
-#: ../../Zotlabs/Module/Settings.php:974
+#: ../../Zotlabs/Module/Settings.php:976
 msgid "Publish your default profile in the network directory"
 msgstr "Standard-Profil im Netzwerk-Verzeichnis veröffentlichen"
 
-#: ../../Zotlabs/Module/Settings.php:979
+#: ../../Zotlabs/Module/Settings.php:981
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr "Dürfen wir Dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?"
 
-#: ../../Zotlabs/Module/Settings.php:988
+#: ../../Zotlabs/Module/Settings.php:990
 msgid "Your channel address is"
 msgstr "Deine Kanal-Adresse lautet"
 
-#: ../../Zotlabs/Module/Settings.php:1030
+#: ../../Zotlabs/Module/Settings.php:1032
 msgid "Channel Settings"
 msgstr "Kanal-Einstellungen"
 
-#: ../../Zotlabs/Module/Settings.php:1037
+#: ../../Zotlabs/Module/Settings.php:1039
 msgid "Basic Settings"
 msgstr "Grundeinstellungen"
 
-#: ../../Zotlabs/Module/Settings.php:1038 ../../include/identity.php:1279
+#: ../../Zotlabs/Module/Settings.php:1040 ../../include/identity.php:1286
 msgid "Full Name:"
 msgstr "Voller Name:"
 
-#: ../../Zotlabs/Module/Settings.php:1040
+#: ../../Zotlabs/Module/Settings.php:1042
 msgid "Your Timezone:"
 msgstr "Ihre Zeitzone:"
 
-#: ../../Zotlabs/Module/Settings.php:1041
+#: ../../Zotlabs/Module/Settings.php:1043
 msgid "Default Post Location:"
 msgstr "Standardstandort:"
 
-#: ../../Zotlabs/Module/Settings.php:1041
+#: ../../Zotlabs/Module/Settings.php:1043
 msgid "Geographical location to display on your posts"
 msgstr "Geografischer Ort, der bei Deinen Beiträgen angezeigt werden soll"
 
-#: ../../Zotlabs/Module/Settings.php:1042
+#: ../../Zotlabs/Module/Settings.php:1044
 msgid "Use Browser Location:"
 msgstr "Standort des Browsers verwenden:"
 
-#: ../../Zotlabs/Module/Settings.php:1044
+#: ../../Zotlabs/Module/Settings.php:1046
 msgid "Adult Content"
 msgstr "Nicht jugendfreie Inhalte"
 
-#: ../../Zotlabs/Module/Settings.php:1044
+#: ../../Zotlabs/Module/Settings.php:1046
 msgid ""
 "This channel frequently or regularly publishes adult content. (Please tag "
 "any adult material and/or nudity with #NSFW)"
 msgstr "Dieser Kanal veröffentlicht regelmäßig Inhalte, die für Minderjährige ungeeignet sind. (Bitte markiere solche Inhalte mit dem Schlagwort #NSFW)"
 
-#: ../../Zotlabs/Module/Settings.php:1046
+#: ../../Zotlabs/Module/Settings.php:1048
 msgid "Security and Privacy Settings"
 msgstr "Sicherheits- und Datenschutz-Einstellungen"
 
-#: ../../Zotlabs/Module/Settings.php:1049
+#: ../../Zotlabs/Module/Settings.php:1051
 msgid "Your permissions are already configured. Click to view/adjust"
 msgstr "Deine Zugriffsrechte sind schon konfiguriert. Klicke hier, um sie zu betrachten oder zu ändern"
 
-#: ../../Zotlabs/Module/Settings.php:1051
+#: ../../Zotlabs/Module/Settings.php:1053
 msgid "Hide my online presence"
 msgstr "Meine Online-Präsenz verbergen"
 
-#: ../../Zotlabs/Module/Settings.php:1051
+#: ../../Zotlabs/Module/Settings.php:1053
 msgid "Prevents displaying in your profile that you are online"
 msgstr "Verhindert die Anzeige Deines Online-Status in deinem Profil"
 
-#: ../../Zotlabs/Module/Settings.php:1053
+#: ../../Zotlabs/Module/Settings.php:1055
 msgid "Simple Privacy Settings:"
 msgstr "Einfache Privatsphäre-Einstellungen"
 
-#: ../../Zotlabs/Module/Settings.php:1054
+#: ../../Zotlabs/Module/Settings.php:1056
 msgid ""
 "Very Public - <em>extremely permissive (should be used with caution)</em>"
 msgstr "Komplett offen – <em>extrem ungeschützt (mit großer Vorsicht verwenden!)</em>"
 
-#: ../../Zotlabs/Module/Settings.php:1055
+#: ../../Zotlabs/Module/Settings.php:1057
 msgid ""
 "Typical - <em>default public, privacy when desired (similar to social "
 "network permissions but with improved privacy)</em>"
 msgstr "Typisch – <em>Standard öffentlich, Privatsphäre, wo sie erwünscht ist (ähnlich den Einstellungen in sozialen Netzwerken, aber mit besser geschützter Privatsphäre)</em>"
 
-#: ../../Zotlabs/Module/Settings.php:1056
+#: ../../Zotlabs/Module/Settings.php:1058
 msgid "Private - <em>default private, never open or public</em>"
 msgstr "Privat – <em>Standard privat, nie offen oder öffentlich</em>"
 
-#: ../../Zotlabs/Module/Settings.php:1057
+#: ../../Zotlabs/Module/Settings.php:1059
 msgid "Blocked - <em>default blocked to/from everybody</em>"
 msgstr "Blockiert – <em>Alle standardmäßig blockiert</em>"
 
-#: ../../Zotlabs/Module/Settings.php:1059
+#: ../../Zotlabs/Module/Settings.php:1061
 msgid "Allow others to tag your posts"
 msgstr "Erlaube anderen, Deine Beiträge zu verschlagworten"
 
-#: ../../Zotlabs/Module/Settings.php:1059
+#: ../../Zotlabs/Module/Settings.php:1061
 msgid ""
 "Often used by the community to retro-actively flag inappropriate content"
 msgstr "Wird oft von der Community genutzt um rückwirkend anstößigen Inhalt zu markieren"
 
-#: ../../Zotlabs/Module/Settings.php:1061
+#: ../../Zotlabs/Module/Settings.php:1063
 msgid "Advanced Privacy Settings"
 msgstr "Fortgeschrittene Privatsphäre-Einstellungen"
 
-#: ../../Zotlabs/Module/Settings.php:1063
+#: ../../Zotlabs/Module/Settings.php:1065
 msgid "Expire other channel content after this many days"
 msgstr "Den Inhalt anderer Kanäle nach dieser Anzahl Tage verfallen lassen"
 
-#: ../../Zotlabs/Module/Settings.php:1063
+#: ../../Zotlabs/Module/Settings.php:1065
 #, php-format
 msgid ""
 "0 or blank to use the website limit. The website expires after %d days."
 msgstr "0 oder leer lassen um das Webseiten limit zu nutzen. Die Webseite läuft nach %d Tagen ab."
 
-#: ../../Zotlabs/Module/Settings.php:1064
+#: ../../Zotlabs/Module/Settings.php:1066
 msgid "Maximum Friend Requests/Day:"
 msgstr "Maximale Kontaktanfragen pro Tag:"
 
-#: ../../Zotlabs/Module/Settings.php:1064
+#: ../../Zotlabs/Module/Settings.php:1066
 msgid "May reduce spam activity"
 msgstr "Kann die Spam-Aktivität verringern"
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Zotlabs/Module/Settings.php:1067
 msgid "Default Post Permissions"
 msgstr "Standardeinstellungen für Beitrags-Zugriffsrechte"
 
-#: ../../Zotlabs/Module/Settings.php:1070
+#: ../../Zotlabs/Module/Settings.php:1069
+msgid "Use my default audience setting for the type of post"
+msgstr "Benutze meine Standard-Zielgruppen-Einstellungen für diesen Beitragstyp"
+
+#: ../../Zotlabs/Module/Settings.php:1072
 msgid "Channel permissions category:"
 msgstr "Zugriffsrechte-Kategorie des Kanals:"
 
-#: ../../Zotlabs/Module/Settings.php:1076
+#: ../../Zotlabs/Module/Settings.php:1078
 msgid "Maximum private messages per day from unknown people:"
 msgstr "Maximale Anzahl privater Nachrichten pro Tag von unbekannten Leuten:"
 
-#: ../../Zotlabs/Module/Settings.php:1076
+#: ../../Zotlabs/Module/Settings.php:1078
 msgid "Useful to reduce spamming"
 msgstr "Nützlich, um Spam zu verringern"
 
-#: ../../Zotlabs/Module/Settings.php:1079
+#: ../../Zotlabs/Module/Settings.php:1081
 msgid "Notification Settings"
 msgstr "Benachrichtigungs-Einstellungen"
 
-#: ../../Zotlabs/Module/Settings.php:1080
+#: ../../Zotlabs/Module/Settings.php:1082
 msgid "By default post a status message when:"
 msgstr "Sende standardmäßig Status-Nachrichten, wenn:"
 
-#: ../../Zotlabs/Module/Settings.php:1081
+#: ../../Zotlabs/Module/Settings.php:1083
 msgid "accepting a friend request"
 msgstr "Du eine Verbindungsanfrage annimmst"
 
-#: ../../Zotlabs/Module/Settings.php:1082
+#: ../../Zotlabs/Module/Settings.php:1084
 msgid "joining a forum/community"
 msgstr "Du einem Forum beitrittst"
 
-#: ../../Zotlabs/Module/Settings.php:1083
+#: ../../Zotlabs/Module/Settings.php:1085
 msgid "making an <em>interesting</em> profile change"
 msgstr "Du eine <em>interessante</em> Änderung an Deinem Profil vornimmst"
 
-#: ../../Zotlabs/Module/Settings.php:1084
+#: ../../Zotlabs/Module/Settings.php:1086
 msgid "Send a notification email when:"
 msgstr "Eine E-Mail-Benachrichtigung senden, wenn:"
 
-#: ../../Zotlabs/Module/Settings.php:1085
+#: ../../Zotlabs/Module/Settings.php:1087
 msgid "You receive a connection request"
 msgstr "Du eine Verbindungsanfrage erhältst"
 
-#: ../../Zotlabs/Module/Settings.php:1086
+#: ../../Zotlabs/Module/Settings.php:1088
 msgid "Your connections are confirmed"
 msgstr "Eine Verbindung bestätigt wurde"
 
-#: ../../Zotlabs/Module/Settings.php:1087
+#: ../../Zotlabs/Module/Settings.php:1089
 msgid "Someone writes on your profile wall"
 msgstr "Jemand auf Deine Pinnwand schreibt"
 
-#: ../../Zotlabs/Module/Settings.php:1088
+#: ../../Zotlabs/Module/Settings.php:1090
 msgid "Someone writes a followup comment"
 msgstr "Jemand einen Beitrag kommentiert"
 
-#: ../../Zotlabs/Module/Settings.php:1089
+#: ../../Zotlabs/Module/Settings.php:1091
 msgid "You receive a private message"
 msgstr "Du eine private Nachricht erhältst"
 
-#: ../../Zotlabs/Module/Settings.php:1090
+#: ../../Zotlabs/Module/Settings.php:1092
 msgid "You receive a friend suggestion"
 msgstr "Du einen Kontaktvorschlag erhältst"
 
-#: ../../Zotlabs/Module/Settings.php:1091
+#: ../../Zotlabs/Module/Settings.php:1093
 msgid "You are tagged in a post"
 msgstr "Du in einem Beitrag erwähnt wurdest"
 
-#: ../../Zotlabs/Module/Settings.php:1092
+#: ../../Zotlabs/Module/Settings.php:1094
 msgid "You are poked/prodded/etc. in a post"
 msgstr "Du in einem Beitrag angestupst/geknufft/o.ä. wurdest"
 
-#: ../../Zotlabs/Module/Settings.php:1095
+#: ../../Zotlabs/Module/Settings.php:1097
 msgid "Show visual notifications including:"
 msgstr "Visuelle Benachrichtigungen anzeigen für:"
 
-#: ../../Zotlabs/Module/Settings.php:1097
+#: ../../Zotlabs/Module/Settings.php:1099
 msgid "Unseen grid activity"
 msgstr "Ungesehene Netzwerk-Aktivität"
 
-#: ../../Zotlabs/Module/Settings.php:1098
+#: ../../Zotlabs/Module/Settings.php:1100
 msgid "Unseen channel activity"
 msgstr "Ungesehene Kanal-Aktivität"
 
-#: ../../Zotlabs/Module/Settings.php:1099
+#: ../../Zotlabs/Module/Settings.php:1101
 msgid "Unseen private messages"
 msgstr "Ungelesene persönliche Nachrichten"
 
-#: ../../Zotlabs/Module/Settings.php:1099
-#: ../../Zotlabs/Module/Settings.php:1104
-#: ../../Zotlabs/Module/Settings.php:1105
+#: ../../Zotlabs/Module/Settings.php:1101
 #: ../../Zotlabs/Module/Settings.php:1106
+#: ../../Zotlabs/Module/Settings.php:1107
+#: ../../Zotlabs/Module/Settings.php:1108
 msgid "Recommended"
 msgstr "Empfohlen"
 
-#: ../../Zotlabs/Module/Settings.php:1100
+#: ../../Zotlabs/Module/Settings.php:1102
 msgid "Upcoming events"
 msgstr "Baldige Termine"
 
-#: ../../Zotlabs/Module/Settings.php:1101
+#: ../../Zotlabs/Module/Settings.php:1103
 msgid "Events today"
 msgstr "Heutige Termine"
 
-#: ../../Zotlabs/Module/Settings.php:1102
+#: ../../Zotlabs/Module/Settings.php:1104
 msgid "Upcoming birthdays"
 msgstr "Baldige Geburtstage"
 
-#: ../../Zotlabs/Module/Settings.php:1102
+#: ../../Zotlabs/Module/Settings.php:1104
 msgid "Not available in all themes"
 msgstr "Nicht in allen Themes verfügbar"
 
-#: ../../Zotlabs/Module/Settings.php:1103
+#: ../../Zotlabs/Module/Settings.php:1105
 msgid "System (personal) notifications"
 msgstr "System – (persönliche) Benachrichtigungen"
 
-#: ../../Zotlabs/Module/Settings.php:1104
+#: ../../Zotlabs/Module/Settings.php:1106
 msgid "System info messages"
 msgstr "System – Info-Nachrichten"
 
-#: ../../Zotlabs/Module/Settings.php:1105
+#: ../../Zotlabs/Module/Settings.php:1107
 msgid "System critical alerts"
 msgstr "System – kritische Warnungen"
 
-#: ../../Zotlabs/Module/Settings.php:1106
+#: ../../Zotlabs/Module/Settings.php:1108
 msgid "New connections"
 msgstr "Neue Verbindungen"
 
-#: ../../Zotlabs/Module/Settings.php:1107
+#: ../../Zotlabs/Module/Settings.php:1109
 msgid "System Registrations"
 msgstr "System – Registrierungen"
 
-#: ../../Zotlabs/Module/Settings.php:1108
+#: ../../Zotlabs/Module/Settings.php:1110
 msgid ""
 "Also show new wall posts, private messages and connections under Notices"
 msgstr "Neue Pinnwand-Nachrichten, private Nachrichten und Verbindungen unter Benachrichtigungen anzeigen"
 
-#: ../../Zotlabs/Module/Settings.php:1110
+#: ../../Zotlabs/Module/Settings.php:1112
 msgid "Notify me of events this many days in advance"
 msgstr "Benachrichtige mich zu Terminen so viele Tage im Voraus"
 
-#: ../../Zotlabs/Module/Settings.php:1110
+#: ../../Zotlabs/Module/Settings.php:1112
 msgid "Must be greater than 0"
 msgstr "Muss größer als 0 sein"
 
-#: ../../Zotlabs/Module/Settings.php:1112
+#: ../../Zotlabs/Module/Settings.php:1114
 msgid "Advanced Account/Page Type Settings"
 msgstr "Erweiterte Account- und Seitenart-Einstellungen"
 
-#: ../../Zotlabs/Module/Settings.php:1113
+#: ../../Zotlabs/Module/Settings.php:1115
 msgid "Change the behaviour of this account for special situations"
 msgstr "Ändere das Verhalten dieses Accounts unter speziellen Umständen"
 
-#: ../../Zotlabs/Module/Settings.php:1116
+#: ../../Zotlabs/Module/Settings.php:1118
 msgid ""
 "Please enable expert mode (in <a href=\"settings/features\">Settings > "
 "Additional features</a>) to adjust!"
 msgstr "Aktiviere den Expertenmodus (unter <a href=\"settings/features\">Settings > Zusätzliche Funktionen</a>), um hier Einstellungen vorzunehmen!"
 
-#: ../../Zotlabs/Module/Settings.php:1117
+#: ../../Zotlabs/Module/Settings.php:1119
 msgid "Miscellaneous Settings"
 msgstr "Sonstige Einstellungen"
 
-#: ../../Zotlabs/Module/Settings.php:1118
+#: ../../Zotlabs/Module/Settings.php:1120
 msgid "Default photo upload folder"
 msgstr "Voreingestellter Ordner für hochgeladene Fotos"
 
-#: ../../Zotlabs/Module/Settings.php:1118
-#: ../../Zotlabs/Module/Settings.php:1119
+#: ../../Zotlabs/Module/Settings.php:1120
+#: ../../Zotlabs/Module/Settings.php:1121
 msgid "%Y - current year, %m -  current month"
 msgstr "%Y - aktuelles Jahr, %m -  aktueller Monat"
 
-#: ../../Zotlabs/Module/Settings.php:1119
+#: ../../Zotlabs/Module/Settings.php:1121
 msgid "Default file upload folder"
 msgstr "Voreingestellter Ordner für hochgeladene Dateien"
 
-#: ../../Zotlabs/Module/Settings.php:1121
+#: ../../Zotlabs/Module/Settings.php:1123
 msgid "Personal menu to display in your channel pages"
 msgstr "Eigenes Menü zur Anzeige auf den Seiten deines Kanals"
 
-#: ../../Zotlabs/Module/Settings.php:1123
+#: ../../Zotlabs/Module/Settings.php:1125
 msgid "Remove this channel."
 msgstr "Diesen Kanal löschen"
 
-#: ../../Zotlabs/Module/Settings.php:1124
+#: ../../Zotlabs/Module/Settings.php:1126
 msgid "Firefox Share $Projectname provider"
 msgstr "$Projectname-Provider für Firefox Share"
 
-#: ../../Zotlabs/Module/Settings.php:1125
+#: ../../Zotlabs/Module/Settings.php:1127
 msgid "Start calendar week on monday"
 msgstr "Montag als erster Tag der Kalenderwoche"
 
@@ -5594,7 +5524,7 @@ msgid ""
 msgstr "Möglicherweise musst Du die Datei install/schema_xxx.sql manuell mit Hilfe eines Datenkbank-Clients importieren."
 
 #: ../../Zotlabs/Module/Setup.php:227 ../../Zotlabs/Module/Setup.php:289
-#: ../../Zotlabs/Module/Setup.php:739
+#: ../../Zotlabs/Module/Setup.php:744
 msgid "Please see the file \"install/INSTALL.txt\"."
 msgstr "Lies die Datei \"install/INSTALL.txt\"."
 
@@ -5696,289 +5626,297 @@ msgid ""
 "proficient audiences"
 msgstr "Einige erweiterte Funktionen können ungeachtet ihrer Nützlichkeit eher für eine technisch versierte Zielgruppe geeignet sein."
 
-#: ../../Zotlabs/Module/Setup.php:422
+#: ../../Zotlabs/Module/Setup.php:411
+msgid "PHP version 5.4 or greater is required."
+msgstr "PHP wird in Version 5.4 oder höher benötigt."
+
+#: ../../Zotlabs/Module/Setup.php:412
+msgid "PHP version"
+msgstr "PHP-Version"
+
+#: ../../Zotlabs/Module/Setup.php:427
 msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr "Konnte die Kommandozeilen-Version von PHP nicht im PATH des Web-Servers finden."
 
-#: ../../Zotlabs/Module/Setup.php:423
+#: ../../Zotlabs/Module/Setup.php:428
 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 "Ohne Kommandozeilen-Version von PHP auf dem Server wirst Du nicht in der Lage sein, Hintergrundprozesse via cron auszuführen."
 
-#: ../../Zotlabs/Module/Setup.php:427
+#: ../../Zotlabs/Module/Setup.php:432
 msgid "PHP executable path"
 msgstr "PHP Pfad zu ausführbarer Datei"
 
-#: ../../Zotlabs/Module/Setup.php:427
+#: ../../Zotlabs/Module/Setup.php:432
 msgid ""
 "Enter full path to php executable. You can leave this blank to continue the "
 "installation."
 msgstr "Gib den vollen Pfad zum PHP-Interpreter an. Du kannst dieses Feld frei lassen und mit der Installation fortfahren."
 
-#: ../../Zotlabs/Module/Setup.php:432
+#: ../../Zotlabs/Module/Setup.php:437
 msgid "Command line PHP"
 msgstr "PHP Befehlszeile"
 
-#: ../../Zotlabs/Module/Setup.php:441
+#: ../../Zotlabs/Module/Setup.php:446
 msgid ""
 "The command line version of PHP on your system does not have "
 "\"register_argc_argv\" enabled."
 msgstr "Bei der Kommandozeilen-Version von PHP auf Deinem System ist \"register_argc_argv\" nicht aktiviert."
 
-#: ../../Zotlabs/Module/Setup.php:442
+#: ../../Zotlabs/Module/Setup.php:447
 msgid "This is required for message delivery to work."
 msgstr "Das wird benötigt, damit die Auslieferung von Nachrichten funktioniert."
 
-#: ../../Zotlabs/Module/Setup.php:445
+#: ../../Zotlabs/Module/Setup.php:450
 msgid "PHP register_argc_argv"
 msgstr "PHP register_argc_argv"
 
-#: ../../Zotlabs/Module/Setup.php:463
+#: ../../Zotlabs/Module/Setup.php:468
 #, 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 "Die Maximalgröße für Uploads insgesamt liegt bei %s. Die Maximalgröße für eine Datei liegt bei %s. Es können maximal %d Dateien gleichzeitig hochgeladen werden."
 
-#: ../../Zotlabs/Module/Setup.php:468
+#: ../../Zotlabs/Module/Setup.php:473
 msgid "You can adjust these settings in the servers php.ini."
 msgstr "Du kannst diese Einstellungen in der php.ini des Servers ändern."
 
-#: ../../Zotlabs/Module/Setup.php:470
+#: ../../Zotlabs/Module/Setup.php:475
 msgid "PHP upload limits"
 msgstr "PHP-Hochladebeschränkungen"
 
-#: ../../Zotlabs/Module/Setup.php:493
+#: ../../Zotlabs/Module/Setup.php:498
 msgid ""
 "Error: the \"openssl_pkey_new\" function on this system is not able to "
 "generate encryption keys"
 msgstr "Fehler: Die „openssl_pkey_new“-Funktion auf diesem System ist nicht in der Lage, Schlüssel für die Verschlüsselung zu erzeugen."
 
-#: ../../Zotlabs/Module/Setup.php:494
+#: ../../Zotlabs/Module/Setup.php:499
 msgid ""
 "If running under Windows, please see "
 "\"http://www.php.net/manual/en/openssl.installation.php\"."
 msgstr "Wenn Du Windows verwendest, findest Du unter http://www.php.net/manual/en/openssl.installation.php eine Installationsanleitung."
 
-#: ../../Zotlabs/Module/Setup.php:497
+#: ../../Zotlabs/Module/Setup.php:502
 msgid "Generate encryption keys"
 msgstr "Verschlüsselungsschlüssel  generieren"
 
-#: ../../Zotlabs/Module/Setup.php:509
+#: ../../Zotlabs/Module/Setup.php:514
 msgid "libCurl PHP module"
 msgstr "libCurl-PHP-Modul"
 
-#: ../../Zotlabs/Module/Setup.php:510
+#: ../../Zotlabs/Module/Setup.php:515
 msgid "GD graphics PHP module"
 msgstr "GD-Grafik-PHP-Modul"
 
-#: ../../Zotlabs/Module/Setup.php:511
+#: ../../Zotlabs/Module/Setup.php:516
 msgid "OpenSSL PHP module"
 msgstr "OpenSSL-PHP-Modul"
 
-#: ../../Zotlabs/Module/Setup.php:512
+#: ../../Zotlabs/Module/Setup.php:517
 msgid "mysqli or postgres PHP module"
 msgstr "mysqli oder postgres PHP-Modul"
 
-#: ../../Zotlabs/Module/Setup.php:513
+#: ../../Zotlabs/Module/Setup.php:518
 msgid "mb_string PHP module"
 msgstr "mb_string-PHP-Modul"
 
-#: ../../Zotlabs/Module/Setup.php:514
+#: ../../Zotlabs/Module/Setup.php:519
 msgid "mcrypt PHP module"
 msgstr "mcrypt-PHP-Modul"
 
-#: ../../Zotlabs/Module/Setup.php:515
+#: ../../Zotlabs/Module/Setup.php:520
 msgid "xml PHP module"
 msgstr "xml-PHP-Modul"
 
-#: ../../Zotlabs/Module/Setup.php:519 ../../Zotlabs/Module/Setup.php:521
+#: ../../Zotlabs/Module/Setup.php:524 ../../Zotlabs/Module/Setup.php:526
 msgid "Apache mod_rewrite module"
 msgstr "Apache-mod_rewrite-Modul"
 
-#: ../../Zotlabs/Module/Setup.php:519
+#: ../../Zotlabs/Module/Setup.php:524
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr "Fehler: Das Apache-Modul mod-rewrite wird benötigt, ist aber nicht installiert."
 
-#: ../../Zotlabs/Module/Setup.php:525 ../../Zotlabs/Module/Setup.php:528
+#: ../../Zotlabs/Module/Setup.php:530 ../../Zotlabs/Module/Setup.php:533
 msgid "proc_open"
 msgstr "proc_open"
 
-#: ../../Zotlabs/Module/Setup.php:525
+#: ../../Zotlabs/Module/Setup.php:530
 msgid ""
 "Error: proc_open is required but is either not installed or has been "
 "disabled in php.ini"
 msgstr "Fehler: proc_open wird benötigt, ist aber entweder nicht installiert oder wurde in der php.ini deaktiviert"
 
-#: ../../Zotlabs/Module/Setup.php:533
+#: ../../Zotlabs/Module/Setup.php:538
 msgid "Error: libCURL PHP module required but not installed."
 msgstr "Fehler: Das PHP-Modul libCURL wird benötigt, ist aber nicht installiert."
 
-#: ../../Zotlabs/Module/Setup.php:537
+#: ../../Zotlabs/Module/Setup.php:542
 msgid ""
 "Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr "Fehler: Das PHP-Modul GD-Grafik mit JPEG-Unterstützung wird benötigt, ist aber nicht installiert."
 
-#: ../../Zotlabs/Module/Setup.php:541
+#: ../../Zotlabs/Module/Setup.php:546
 msgid "Error: openssl PHP module required but not installed."
 msgstr "Fehler: Das PHP-Modul openssl wird benötigt, ist aber nicht installiert."
 
-#: ../../Zotlabs/Module/Setup.php:545
+#: ../../Zotlabs/Module/Setup.php:550
 msgid ""
 "Error: mysqli or postgres PHP module required but neither are installed."
 msgstr "Fehler: Das mysqli oder postgres PHP-Modul ist erforderlich, aber keines von beiden ist installiert."
 
-#: ../../Zotlabs/Module/Setup.php:549
+#: ../../Zotlabs/Module/Setup.php:554
 msgid "Error: mb_string PHP module required but not installed."
 msgstr "Fehler: Das PHP-Modul mb_string wird benötigt, ist aber nicht installiert."
 
-#: ../../Zotlabs/Module/Setup.php:553
+#: ../../Zotlabs/Module/Setup.php:558
 msgid "Error: mcrypt PHP module required but not installed."
 msgstr "Fehler: Das PHP-Modul mcrypt wird benötigt, ist aber nicht installiert."
 
-#: ../../Zotlabs/Module/Setup.php:557
+#: ../../Zotlabs/Module/Setup.php:562
 msgid "Error: xml PHP module required for DAV but not installed."
 msgstr "Fehler: Das xml-PHP-Modul wird für DAV benötigt, ist aber nicht installiert."
 
-#: ../../Zotlabs/Module/Setup.php:575
+#: ../../Zotlabs/Module/Setup.php:580
 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 "Der Installations-Assistent muss in der Lage sein, die Datei \".htconfig.php\" im Stammverzeichnis des Web-Servers anzulegen, ist er aber nicht."
 
-#: ../../Zotlabs/Module/Setup.php:576
+#: ../../Zotlabs/Module/Setup.php:581
 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 "Meist liegt das daran, dass der Nutzer, unter dem der Web-Server läuft, keine Schreibrechte in dem Verzeichnis hat – selbst wenn Du selbst das darfst."
 
-#: ../../Zotlabs/Module/Setup.php:577
+#: ../../Zotlabs/Module/Setup.php:582
 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 "Am Schluss dieses Vorgangs wird ein Text generiert, den Du unter dem Dateinamen .htconfig.php im Stammverzeichnis Deiner Hubzilla-Installation speichern musst."
 
-#: ../../Zotlabs/Module/Setup.php:578
+#: ../../Zotlabs/Module/Setup.php:583
 msgid ""
 "You can alternatively skip this procedure and perform a manual installation."
 " Please see the file \"install/INSTALL.txt\" for instructions."
 msgstr "Alternativ kannst Du diesen Schritt überspringen und die Installation manuell vornehmen. Lies dazu die Datei install/INSTALL.txt."
 
-#: ../../Zotlabs/Module/Setup.php:581
+#: ../../Zotlabs/Module/Setup.php:586
 msgid ".htconfig.php is writable"
 msgstr ".htconfig.php ist beschreibbar"
 
-#: ../../Zotlabs/Module/Setup.php:595
+#: ../../Zotlabs/Module/Setup.php:600
 msgid ""
 "Red uses the Smarty3 template engine to render its web views. Smarty3 "
 "compiles templates to PHP to speed up rendering."
 msgstr "$Projectname verwendet Smarty3 um Vorlagen für die Webdarstellung zu übersetzen. Smarty3 übersetzt diese Vorlagen nach PHP, um die Darstellung zu beschleunigen."
 
-#: ../../Zotlabs/Module/Setup.php:596
+#: ../../Zotlabs/Module/Setup.php:601
 #, 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 "Um diese kompilierten Vorlagen speichern zu können, braucht der Webserver Schreibzugriff auf das Verzeichnis %s unterhalb des $Projectname-Installationsverzeichnisses."
 
-#: ../../Zotlabs/Module/Setup.php:597 ../../Zotlabs/Module/Setup.php:618
+#: ../../Zotlabs/Module/Setup.php:602 ../../Zotlabs/Module/Setup.php:623
 msgid ""
 "Please ensure that the user that your web server runs as (e.g. www-data) has"
 " write access to this folder."
 msgstr "Bitte stelle sicher, dass der Nutzer, unter dem der Web-Server läuft (z.B. www-data), Schreibzugriff auf dieses Verzeichnis hat."
 
-#: ../../Zotlabs/Module/Setup.php:598
+#: ../../Zotlabs/Module/Setup.php:603
 #, 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 "Hinweis: Aus Sicherheitsgründen sollte der Web-Server nur auf %s Schreibrechte haben, nicht auf die Template-Dateien (.tpl), die das Verzeichnis enthält."
 
-#: ../../Zotlabs/Module/Setup.php:601
+#: ../../Zotlabs/Module/Setup.php:606
 #, php-format
 msgid "%s is writable"
 msgstr "%s ist beschreibbar"
 
-#: ../../Zotlabs/Module/Setup.php:617
+#: ../../Zotlabs/Module/Setup.php:622
 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 "$Projectname benutzt das Verzeichnis store, um hochgeladene Dateien zu speichern. Der Webserver benötigt Schreibrechte für dieses Verzeichnis direkt unterhalb des Red-Stammverzeichnisses"
 
-#: ../../Zotlabs/Module/Setup.php:621
+#: ../../Zotlabs/Module/Setup.php:626
 msgid "store is writable"
 msgstr "store ist schreibbar"
 
-#: ../../Zotlabs/Module/Setup.php:654
+#: ../../Zotlabs/Module/Setup.php:659
 msgid ""
 "SSL certificate cannot be validated. Fix certificate or disable https access"
 " to this site."
 msgstr "Das SSL-Zertifikat konnte nicht validiert werden. Korrigiere das Zertifikat oder deaktiviere den HTTPS-Zugriff auf diesen Server."
 
-#: ../../Zotlabs/Module/Setup.php:655
+#: ../../Zotlabs/Module/Setup.php:660
 msgid ""
 "If you have https access to your website or allow connections to TCP port "
 "443 (the https: port), you MUST use a browser-valid certificate. You MUST "
 "NOT use self-signed certificates!"
 msgstr "Wenn Du via HTTPS auf Deinen Server zugreifen möchtest, also Verbindungen über den Port 443 möglich sein sollen, ist ein SSL-Zertifikat einer Zertifizierungsstelle (CA) notwendig, das von den Browsern ohne Sicherheitsabfrage akzeptiert wird. Die Verwendung eines selbst signierten Zertifikates ist nicht möglich."
 
-#: ../../Zotlabs/Module/Setup.php:656
+#: ../../Zotlabs/Module/Setup.php:661
 msgid ""
 "This restriction is incorporated because public posts from you may for "
 "example contain references to images on your own hub."
 msgstr "Diese Einschränkung wurde eingebaut, weil Deine öffentlichen Beiträge zum Beispiel Verweise auf Bilder auf Deinem eigenen Hub enthalten können."
 
-#: ../../Zotlabs/Module/Setup.php:657
+#: ../../Zotlabs/Module/Setup.php:662
 msgid ""
 "If your certificate is not recognized, members of other sites (who may "
 "themselves have valid certificates) will get a warning message on their own "
 "site complaining about security issues."
 msgstr "Wenn Dein Zertifikat nicht von jedem Browser akzeptiert wird, erhalten die Mitglieder anderer $Projectname-Hubs (die mit korrekten Zertifikaten ausgestattet sind) Sicherheits-Warnmeldungen, obwohl sie gar nicht direkt auf Deinem Server unterwegs sind (zum Beispiel, wenn ein Bild aus einem Deiner Beiträge angezeigt wird)."
 
-#: ../../Zotlabs/Module/Setup.php:658
+#: ../../Zotlabs/Module/Setup.php:663
 msgid ""
 "This can cause usability issues elsewhere (not just on your own site) so we "
 "must insist on this requirement."
 msgstr "Dies kann Probleme für andere Nutzer (nicht nur auf Deinem eigenen Server) verursachen, so dass wir auf dieser Forderung bestehen müssen."
 
-#: ../../Zotlabs/Module/Setup.php:659
+#: ../../Zotlabs/Module/Setup.php:664
 msgid ""
 "Providers are available that issue free certificates which are browser-"
 "valid."
 msgstr "Es gibt einige Zertifizierungsstellen (CAs), bei denen solche Zertifikate kostenlos zu haben sind."
 
-#: ../../Zotlabs/Module/Setup.php:661
+#: ../../Zotlabs/Module/Setup.php:666
 msgid "SSL certificate validation"
 msgstr "SSL Zertifikatverifizierung"
 
-#: ../../Zotlabs/Module/Setup.php:667
+#: ../../Zotlabs/Module/Setup.php:672
 msgid ""
 "Url rewrite in .htaccess is not working. Check your server "
 "configuration.Test: "
 msgstr "Das Umschreiben von URLs (rewrite) per .htaccess funktioniert nicht. Bitte prüfe die Server-Konfiguration. Test:"
 
-#: ../../Zotlabs/Module/Setup.php:670
+#: ../../Zotlabs/Module/Setup.php:675
 msgid "Url rewrite is working"
 msgstr "Url rewrite funktioniert"
 
-#: ../../Zotlabs/Module/Setup.php:679
+#: ../../Zotlabs/Module/Setup.php:684
 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 "Die Datenbank-Konfigurationsdatei „.htconfig.php“ konnte nicht geschrieben werden. Bitte verwende den unten angegebenen Text, um die Konfigurationsdatei im Stammverzeichnis des Webservers anzulegen."
 
-#: ../../Zotlabs/Module/Setup.php:703
+#: ../../Zotlabs/Module/Setup.php:708
 msgid "Errors encountered creating database tables."
 msgstr "Fehler beim Anlegen der Datenbank-Tabellen aufgetreten."
 
-#: ../../Zotlabs/Module/Setup.php:737
+#: ../../Zotlabs/Module/Setup.php:742
 msgid "<h1>What next</h1>"
 msgstr "<h1>Was als Nächstes</h1>"
 
-#: ../../Zotlabs/Module/Setup.php:738
+#: ../../Zotlabs/Module/Setup.php:743
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the "
 "poller."
@@ -6059,70 +5997,76 @@ msgstr "Vorschläge, Lob, usw.: E-Mail an 'redmatrix' at librelist - dot - com"
 msgid "Site Administrators"
 msgstr "Administratoren"
 
-#: ../../Zotlabs/Module/Sources.php:36
+#: ../../Zotlabs/Module/Sources.php:37
 msgid "Failed to create source. No channel selected."
 msgstr "Konnte die Quelle nicht anlegen. Kein Kanal ausgewählt."
 
-#: ../../Zotlabs/Module/Sources.php:49
+#: ../../Zotlabs/Module/Sources.php:51
 msgid "Source created."
 msgstr "Quelle erstellt."
 
-#: ../../Zotlabs/Module/Sources.php:61
+#: ../../Zotlabs/Module/Sources.php:64
 msgid "Source updated."
 msgstr "Quelle aktualisiert."
 
-#: ../../Zotlabs/Module/Sources.php:86
+#: ../../Zotlabs/Module/Sources.php:90
 msgid "*"
 msgstr "*"
 
-#: ../../Zotlabs/Module/Sources.php:92 ../../include/features.php:71
-#: ../../include/widgets.php:581
+#: ../../Zotlabs/Module/Sources.php:96 ../../include/widgets.php:630
+#: ../../include/features.php:71
 msgid "Channel Sources"
 msgstr "Kanal-Quellen"
 
-#: ../../Zotlabs/Module/Sources.php:93
+#: ../../Zotlabs/Module/Sources.php:97
 msgid "Manage remote sources of content for your channel."
 msgstr "Externe Inhaltsquellen für Deinen Kanal verwalten."
 
-#: ../../Zotlabs/Module/Sources.php:94 ../../Zotlabs/Module/Sources.php:104
+#: ../../Zotlabs/Module/Sources.php:98 ../../Zotlabs/Module/Sources.php:108
 msgid "New Source"
 msgstr "Neue Quelle"
 
-#: ../../Zotlabs/Module/Sources.php:105 ../../Zotlabs/Module/Sources.php:137
+#: ../../Zotlabs/Module/Sources.php:109 ../../Zotlabs/Module/Sources.php:143
 msgid ""
 "Import all or selected content from the following channel into this channel "
 "and distribute it according to your channel settings."
 msgstr "Importiere alle oder ausgewählte Inhalte des folgenden Kanals in diesen Kanal und verteile sie gemäß der Einstellungen dieses Kanals."
 
-#: ../../Zotlabs/Module/Sources.php:106 ../../Zotlabs/Module/Sources.php:138
+#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144
 msgid "Only import content with these words (one per line)"
 msgstr "Importiere nur Beiträge, die folgende Wörter (eines pro Zeile) enthalten"
 
-#: ../../Zotlabs/Module/Sources.php:106 ../../Zotlabs/Module/Sources.php:138
+#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144
 msgid "Leave blank to import all public content"
 msgstr "Leer lassen, um alle öffentlichen Beiträge zu importieren"
 
-#: ../../Zotlabs/Module/Sources.php:107 ../../Zotlabs/Module/Sources.php:141
+#: ../../Zotlabs/Module/Sources.php:111 ../../Zotlabs/Module/Sources.php:148
 msgid "Channel Name"
 msgstr "Name des Kanals"
 
-#: ../../Zotlabs/Module/Sources.php:127 ../../Zotlabs/Module/Sources.php:154
+#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:147
+msgid ""
+"Add the following categories to posts imported from this source (comma "
+"separated)"
+msgstr "Füge die folgenden Kategorien zu Beiträgen, die aus dieser Quelle importiert werden, hinzu (kommagetrennt)"
+
+#: ../../Zotlabs/Module/Sources.php:133 ../../Zotlabs/Module/Sources.php:161
 msgid "Source not found."
 msgstr "Quelle nicht gefunden."
 
-#: ../../Zotlabs/Module/Sources.php:134
+#: ../../Zotlabs/Module/Sources.php:140
 msgid "Edit Source"
 msgstr "Quelle bearbeiten"
 
-#: ../../Zotlabs/Module/Sources.php:135
+#: ../../Zotlabs/Module/Sources.php:141
 msgid "Delete Source"
 msgstr "Quelle löschen"
 
-#: ../../Zotlabs/Module/Sources.php:162
+#: ../../Zotlabs/Module/Sources.php:169
 msgid "Source removed"
 msgstr "Quelle gelöscht"
 
-#: ../../Zotlabs/Module/Sources.php:164
+#: ../../Zotlabs/Module/Sources.php:171
 msgid "Unable to remove source."
 msgstr "Konnte die Quelle nicht löschen."
 
@@ -6151,7 +6095,7 @@ msgid "post"
 msgstr "Beitrag"
 
 #: ../../Zotlabs/Module/Tagger.php:57 ../../include/conversation.php:150
-#: ../../include/text.php:1975
+#: ../../include/text.php:1960
 msgid "comment"
 msgstr "Kommentar"
 
@@ -6304,20 +6248,20 @@ msgstr "Verbindungen anzeigen"
 msgid "Source of Item"
 msgstr "Quelle des Elements"
 
-#: ../../Zotlabs/Module/Webpages.php:186 ../../include/apps.php:136
-#: ../../include/conversation.php:1704 ../../include/nav.php:106
+#: ../../Zotlabs/Module/Webpages.php:184 ../../include/nav.php:106
+#: ../../include/conversation.php:1692 ../../include/apps.php:168
 msgid "Webpages"
 msgstr "Webseiten"
 
-#: ../../Zotlabs/Module/Webpages.php:197 ../../include/page_widgets.php:41
+#: ../../Zotlabs/Module/Webpages.php:195 ../../include/page_widgets.php:41
 msgid "Actions"
 msgstr "Aktionen"
 
-#: ../../Zotlabs/Module/Webpages.php:198 ../../include/page_widgets.php:42
+#: ../../Zotlabs/Module/Webpages.php:196 ../../include/page_widgets.php:42
 msgid "Page Link"
 msgstr "Seiten-Link"
 
-#: ../../Zotlabs/Module/Webpages.php:199
+#: ../../Zotlabs/Module/Webpages.php:197
 msgid "Page Title"
 msgstr "Seitentitel"
 
@@ -6333,11 +6277,11 @@ msgstr "Nach xchans oder Webbies (Kanal-Adressen) suchen, die wie folgt beginnen
 msgid "No username found in import file."
 msgstr "Kein Benutzername in der Importdatei gefunden."
 
-#: ../../include/Import/import_diaspora.php:42 ../../include/import.php:44
+#: ../../include/Import/import_diaspora.php:42 ../../include/import.php:48
 msgid "Unable to create a unique channel address. Import failed."
 msgstr "Es war nicht möglich, eine eindeutige Kanal-Adresse zu erzeugen. Der Import ist fehlgeschlagen."
 
-#: ../../include/dba/dba_driver.php:141
+#: ../../include/dba/dba_driver.php:142
 #, php-format
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr "Kann die DNS-Informationen für den Datenbank-Server '%s' nicht finden"
@@ -6379,148 +6323,148 @@ msgstr "Kann die erstellte Identität nicht empfangen"
 msgid "Default Profile"
 msgstr "Standard-Profil"
 
-#: ../../include/identity.php:784
+#: ../../include/identity.php:791
 msgid "Requested channel is not available."
 msgstr "Angeforderte Kanal nicht verfügbar."
 
-#: ../../include/identity.php:931
+#: ../../include/identity.php:938
 msgid "Create New Profile"
 msgstr "Neues Profil erstellen"
 
-#: ../../include/identity.php:934 ../../include/nav.php:90
+#: ../../include/identity.php:941 ../../include/nav.php:90
 msgid "Edit Profile"
 msgstr "Profile bearbeiten"
 
-#: ../../include/identity.php:951
+#: ../../include/identity.php:958
 msgid "Visible to everybody"
 msgstr "Für jeden sichtbar"
 
-#: ../../include/identity.php:1026 ../../include/identity.php:1281
+#: ../../include/identity.php:1033 ../../include/identity.php:1288
 msgid "Gender:"
 msgstr "Geschlecht:"
 
-#: ../../include/identity.php:1027 ../../include/identity.php:1325
+#: ../../include/identity.php:1034 ../../include/identity.php:1332
 msgid "Status:"
 msgstr "Status:"
 
-#: ../../include/identity.php:1028 ../../include/identity.php:1336
+#: ../../include/identity.php:1035 ../../include/identity.php:1343
 msgid "Homepage:"
 msgstr "Homepage:"
 
-#: ../../include/identity.php:1029
+#: ../../include/identity.php:1036
 msgid "Online Now"
 msgstr "gerade online"
 
-#: ../../include/identity.php:1117 ../../include/identity.php:1193
+#: ../../include/identity.php:1124 ../../include/identity.php:1200
 msgid "F d"
 msgstr "d. F"
 
-#: ../../include/identity.php:1173
+#: ../../include/identity.php:1180
 msgid "Birthday Reminders"
 msgstr "Geburtstags Erinnerungen"
 
-#: ../../include/identity.php:1174
+#: ../../include/identity.php:1181
 msgid "Birthdays this week:"
 msgstr "Geburtstage in dieser Woche:"
 
-#: ../../include/identity.php:1225
+#: ../../include/identity.php:1232
 msgid "[No description]"
 msgstr "[Keine Beschreibung]"
 
-#: ../../include/identity.php:1243
+#: ../../include/identity.php:1250
 msgid "Event Reminders"
 msgstr "Termin-Erinnerungen"
 
-#: ../../include/identity.php:1244
+#: ../../include/identity.php:1251
 msgid "Events this week:"
 msgstr "Termine in dieser Woche:"
 
-#: ../../include/identity.php:1286
+#: ../../include/identity.php:1293
 msgid "Like this channel"
 msgstr "Dieser Kanal gefällt mir"
 
-#: ../../include/identity.php:1310
+#: ../../include/identity.php:1317
 msgid "j F, Y"
 msgstr "j. F Y"
 
-#: ../../include/identity.php:1311
+#: ../../include/identity.php:1318
 msgid "j F"
 msgstr "j. F"
 
-#: ../../include/identity.php:1318
+#: ../../include/identity.php:1325
 msgid "Birthday:"
 msgstr "Geburtstag:"
 
-#: ../../include/identity.php:1331
+#: ../../include/identity.php:1338
 #, php-format
 msgid "for %1$d %2$s"
 msgstr "seit %1$d %2$s"
 
-#: ../../include/identity.php:1334
+#: ../../include/identity.php:1341
 msgid "Sexual Preference:"
 msgstr "Sexuelle Orientierung:"
 
-#: ../../include/identity.php:1340
+#: ../../include/identity.php:1347
 msgid "Tags:"
 msgstr "Schlagworte:"
 
-#: ../../include/identity.php:1342
+#: ../../include/identity.php:1349
 msgid "Political Views:"
 msgstr "Politische Ansichten:"
 
-#: ../../include/identity.php:1344
+#: ../../include/identity.php:1351
 msgid "Religion:"
 msgstr "Religion:"
 
-#: ../../include/identity.php:1348
+#: ../../include/identity.php:1355
 msgid "Hobbies/Interests:"
 msgstr "Hobbys/Interessen:"
 
-#: ../../include/identity.php:1350
+#: ../../include/identity.php:1357
 msgid "Likes:"
 msgstr "Gefällt:"
 
-#: ../../include/identity.php:1352
+#: ../../include/identity.php:1359
 msgid "Dislikes:"
 msgstr "Gefällt nicht:"
 
-#: ../../include/identity.php:1354
+#: ../../include/identity.php:1361
 msgid "Contact information and Social Networks:"
 msgstr "Kontaktinformation und soziale Netzwerke:"
 
-#: ../../include/identity.php:1356
+#: ../../include/identity.php:1363
 msgid "My other channels:"
 msgstr "Meine anderen Kanäle:"
 
-#: ../../include/identity.php:1358
+#: ../../include/identity.php:1365
 msgid "Musical interests:"
 msgstr "Musikalische Interessen:"
 
-#: ../../include/identity.php:1360
+#: ../../include/identity.php:1367
 msgid "Books, literature:"
 msgstr "Bücher, Literatur:"
 
-#: ../../include/identity.php:1362
+#: ../../include/identity.php:1369
 msgid "Television:"
 msgstr "Fernsehen:"
 
-#: ../../include/identity.php:1364
+#: ../../include/identity.php:1371
 msgid "Film/dance/culture/entertainment:"
 msgstr "Film/Tanz/Kultur/Unterhaltung:"
 
-#: ../../include/identity.php:1366
+#: ../../include/identity.php:1373
 msgid "Love/Romance:"
 msgstr "Liebe/Romantik:"
 
-#: ../../include/identity.php:1368
+#: ../../include/identity.php:1375
 msgid "Work/employment:"
 msgstr "Arbeit/Anstellung:"
 
-#: ../../include/identity.php:1370
+#: ../../include/identity.php:1377
 msgid "School/education:"
 msgstr "Schule/Ausbildung:"
 
-#: ../../include/identity.php:1390
+#: ../../include/identity.php:1397
 msgid "Like this thing"
 msgstr "Gefällt mir"
 
@@ -6533,237 +6477,47 @@ msgstr "Neuer Beitrag wurde erzeugt"
 msgid "commented on %s's post"
 msgstr "hat %s's Beitrag kommentiert"
 
-#: ../../include/ItemObject.php:89 ../../include/conversation.php:664
-msgid "Private Message"
-msgstr "Private Nachricht"
+#: ../../include/oembed.php:324
+msgid "Embedded content"
+msgstr "Eingebetteter Inhalt"
 
-#: ../../include/ItemObject.php:126 ../../include/conversation.php:656
-msgid "Select"
-msgstr "Auswählen"
+#: ../../include/oembed.php:333
+msgid "Embedding disabled"
+msgstr "Einbetten ausgeschaltet"
 
-#: ../../include/ItemObject.php:130
-msgid "Save to Folder"
-msgstr "In Ordner speichern"
+#: ../../include/acl_selectors.php:236
+#: ../../include/PermissionDescription.php:31
+msgid "Visible to your default audience"
+msgstr "Standard-Sichtbarkeit gemäß Kanaleinstellungen"
 
-#: ../../include/ItemObject.php:151
-msgid "I will attend"
-msgstr "Ich werde teilnehmen"
+#: ../../include/acl_selectors.php:274
+msgid "Limit access:"
+msgstr "Beschränke Zugriff:"
 
-#: ../../include/ItemObject.php:151
-msgid "I will not attend"
-msgstr "Ich werde nicht teilnehmen"
+#: ../../include/acl_selectors.php:275
+msgid ""
+"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit"
+" the scope of \"Show\"."
+msgstr "Wähle \"Anzeigen\", um Betrachtung zuzulassen. \"Nicht anzeigen\" überstimmt und limitiert den Aktionsradius von \"Anzeigen\" für Ausnahmen."
 
-#: ../../include/ItemObject.php:151
-msgid "I might attend"
-msgstr "Ich werde vielleicht teilnehmen"
+#: ../../include/acl_selectors.php:276
+msgid "Show"
+msgstr "Anzeigen"
 
-#: ../../include/ItemObject.php:161
-msgid "I agree"
-msgstr "Ich stimme zu"
+#: ../../include/acl_selectors.php:277
+msgid "Don't show"
+msgstr "Nicht anzeigen"
 
-#: ../../include/ItemObject.php:161
-msgid "I disagree"
-msgstr "Ich lehne ab"
+#: ../../include/acl_selectors.php:283
+msgid "Other networks and post services"
+msgstr "Andere Netzwerke und Platformen"
 
-#: ../../include/ItemObject.php:161
-msgid "I abstain"
-msgstr "Ich enthalte mich"
-
-#: ../../include/ItemObject.php:212
-msgid "Add Star"
-msgstr "Stern hinzufügen"
-
-#: ../../include/ItemObject.php:213
-msgid "Remove Star"
-msgstr "Stern entfernen"
-
-#: ../../include/ItemObject.php:214
-msgid "Toggle Star Status"
-msgstr "Markierungsstatus (Stern) umschalten"
-
-#: ../../include/ItemObject.php:218
-msgid "starred"
-msgstr "markiert"
-
-#: ../../include/ItemObject.php:227 ../../include/conversation.php:671
-msgid "Message signature validated"
-msgstr "Signatur überprüft"
-
-#: ../../include/ItemObject.php:228 ../../include/conversation.php:672
-msgid "Message signature incorrect"
-msgstr "Signatur nicht korrekt"
-
-#: ../../include/ItemObject.php:236
-msgid "Add Tag"
-msgstr "Tag hinzufügen"
-
-#: ../../include/ItemObject.php:254 ../../include/taxonomy.php:328
-msgid "like"
-msgstr "mag"
-
-#: ../../include/ItemObject.php:255 ../../include/taxonomy.php:329
-msgid "dislike"
-msgstr "verurteile"
-
-#: ../../include/ItemObject.php:259
-msgid "Share This"
-msgstr "Teilen"
-
-#: ../../include/ItemObject.php:259
-msgid "share"
-msgstr "Teilen"
-
-#: ../../include/ItemObject.php:268
-msgid "Delivery Report"
-msgstr "Zustellungsbericht"
-
-#: ../../include/ItemObject.php:286
+#: ../../include/acl_selectors.php:313
 #, php-format
-msgid "%d comment"
-msgid_plural "%d comments"
-msgstr[0] "%d Kommentar"
-msgstr[1] "%d Kommentare"
-
-#: ../../include/ItemObject.php:315 ../../include/ItemObject.php:316
-#, php-format
-msgid "View %s's profile - %s"
-msgstr "Schaue Dir %ss Profil an – %s"
-
-#: ../../include/ItemObject.php:319
-msgid "to"
-msgstr "an"
-
-#: ../../include/ItemObject.php:320
-msgid "via"
-msgstr "via"
-
-#: ../../include/ItemObject.php:321
-msgid "Wall-to-Wall"
-msgstr "Wall-to-Wall"
-
-#: ../../include/ItemObject.php:322
-msgid "via Wall-To-Wall:"
-msgstr "via Wall-To-Wall:"
-
-#: ../../include/ItemObject.php:334 ../../include/conversation.php:719
-#, php-format
-msgid "from %s"
-msgstr "via %s"
-
-#: ../../include/ItemObject.php:337 ../../include/conversation.php:722
-#, php-format
-msgid "last edited: %s"
-msgstr "zuletzt bearbeitet: %s"
-
-#: ../../include/ItemObject.php:338 ../../include/conversation.php:723
-#, php-format
-msgid "Expires: %s"
-msgstr "Verfällt: %s"
-
-#: ../../include/ItemObject.php:362 ../../bookmarker/bookmarker.php:45
-msgid "Save Bookmarks"
-msgstr "Favoriten speichern"
-
-#: ../../include/ItemObject.php:363
-msgid "Add to Calendar"
-msgstr "Zum Kalender hinzufügen"
-
-#: ../../include/ItemObject.php:372
-msgid "Mark all seen"
-msgstr "Alle als gelesen markieren"
-
-#: ../../include/ItemObject.php:413 ../../include/js_strings.php:7
-msgid "[+] show all"
-msgstr "[+] Alle anzeigen"
-
-#: ../../include/ItemObject.php:709
-msgid "Image"
-msgstr "Bild"
-
-#: ../../include/ItemObject.php:710
-msgid "Insert Link"
-msgstr "Link einfügen"
-
-#: ../../include/ItemObject.php:711
-msgid "Video"
-msgstr "Video"
-
-#: ../../include/account.php:28
-msgid "Not a valid email address"
-msgstr "Ungültige E-Mail-Adresse"
-
-#: ../../include/account.php:30
-msgid "Your email domain is not among those allowed on this site"
-msgstr "Deine E-Mail-Adresse ist auf dieser Seite nicht erlaubt"
-
-#: ../../include/account.php:36
-msgid "Your email address is already registered at this site."
-msgstr "Deine E-Mail-Adresse ist auf dieser Seite bereits registriert."
-
-#: ../../include/account.php:68
-msgid "An invitation is required."
-msgstr "Eine Einladung wird benötigt."
-
-#: ../../include/account.php:72
-msgid "Invitation could not be verified."
-msgstr "Die Einladung konnte nicht bestätigt werden."
-
-#: ../../include/account.php:122
-msgid "Please enter the required information."
-msgstr "Bitte gib die benötigten Informationen ein."
-
-#: ../../include/account.php:189
-msgid "Failed to store account information."
-msgstr "Speichern der Nutzerkontodaten fehlgeschlagen."
-
-#: ../../include/account.php:249
-#, php-format
-msgid "Registration confirmation for %s"
-msgstr "Registrierungsbestätigung für %s"
-
-#: ../../include/account.php:315
-#, php-format
-msgid "Registration request at %s"
-msgstr "Registrierungsanfrage auf %s"
-
-#: ../../include/account.php:317 ../../include/account.php:344
-#: ../../include/account.php:404 ../../include/network.php:1875
-msgid "Administrator"
-msgstr "Administrator"
-
-#: ../../include/account.php:339
-msgid "your registration password"
-msgstr "Dein Registrierungspasswort"
-
-#: ../../include/account.php:342 ../../include/account.php:402
-#, php-format
-msgid "Registration details for %s"
-msgstr "Registrierungsdetails für %s"
-
-#: ../../include/account.php:414
-msgid "Account approved."
-msgstr "Nutzerkonto bestätigt."
-
-#: ../../include/account.php:454
-#, php-format
-msgid "Registration revoked for %s"
-msgstr "Registrierung für %s wurde widerrufen"
-
-#: ../../include/account.php:506
-msgid "Account verified. Please login."
-msgstr "Nutzerkonto wurde bestätigt. Bitte melde Dich an!"
-
-#: ../../include/account.php:719 ../../include/account.php:721
-msgid "Click here to upgrade."
-msgstr "Klicke hier, um das Upgrade durchzuführen."
-
-#: ../../include/account.php:727
-msgid "This action exceeds the limits set by your subscription plan."
-msgstr "Diese Aktion überschreitet die Grenzen Ihres Abonnements."
-
-#: ../../include/account.php:732
-msgid "This action is not available under your subscription plan."
-msgstr "Diese Aktion ist in Ihrem Abonnement nicht verfügbar."
+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 "Beitragsberechtigungen %s können nicht geändert werden %s, nachdem der Beitrag gesendet wurde.<br />Diese Berechtigungen bestimmen, wer den Beitrag sehen kann."
 
 #: ../../include/profile_selectors.php:6
 msgid "Currently Male"
@@ -6998,22 +6752,6 @@ msgstr "Interessiert mich nicht"
 msgid "Ask me"
 msgstr "Frag mich mal"
 
-#: ../../include/acl_selectors.php:218
-msgid "Visible to your default audience"
-msgstr "Standard-Sichtbarkeit gemäß Kanaleinstellungen"
-
-#: ../../include/acl_selectors.php:243
-msgid "Show"
-msgstr "Anzeigen"
-
-#: ../../include/acl_selectors.php:244
-msgid "Don't show"
-msgstr "Nicht anzeigen"
-
-#: ../../include/acl_selectors.php:249
-msgid "Other networks and post services"
-msgstr "Andere Netzwerke und Platformen"
-
 #: ../../include/activities.php:42
 msgid " and "
 msgstr "und"
@@ -7037,482 +6775,421 @@ msgstr "Besuche %1$s's %2$s"
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr "%1$s hat ein aktualisiertes %2$s, %3$s wurde verändert."
 
-#: ../../include/api.php:1338
-msgid "Public Timeline"
-msgstr "Öffentliche Zeitleiste"
-
-#: ../../include/apps.php:128
-msgid "Site Admin"
-msgstr "Hub-Administration"
-
-#: ../../include/apps.php:129 ../../include/conversation.php:1694
-#: ../../include/nav.php:102
-msgid "Bookmarks"
-msgstr "Lesezeichen"
-
-#: ../../include/apps.php:130
-msgid "Address Book"
-msgstr "Adressbuch"
-
-#: ../../include/apps.php:131 ../../include/nav.php:110 ../../boot.php:1602
-msgid "Login"
-msgstr "Anmelden"
-
-#: ../../include/apps.php:133 ../../include/nav.php:182
-msgid "Grid"
-msgstr "Grid"
-
-#: ../../include/apps.php:137 ../../include/nav.php:185
-msgid "Channel Home"
-msgstr "Mein Kanal"
-
-#: ../../include/apps.php:140 ../../include/conversation.php:1667
-#: ../../include/conversation.php:1670 ../../include/nav.php:204
-msgid "Events"
-msgstr "Termine"
-
-#: ../../include/apps.php:141 ../../include/nav.php:170
-msgid "Directory"
-msgstr "Verzeichnis"
-
-#: ../../include/apps.php:143 ../../include/nav.php:196
-msgid "Mail"
-msgstr "Mail"
-
-#: ../../include/apps.php:146 ../../include/nav.php:96
-msgid "Chat"
-msgstr "Chat"
-
-#: ../../include/apps.php:148
-msgid "Probe"
-msgstr "Testen"
-
-#: ../../include/apps.php:149
-msgid "Suggest"
-msgstr "Empfehlen"
-
-#: ../../include/apps.php:150
-msgid "Random Channel"
-msgstr "Zufälliger Kanal"
-
-#: ../../include/apps.php:151
-msgid "Invite"
-msgstr "Einladen"
-
-#: ../../include/apps.php:152 ../../include/widgets.php:1338
-msgid "Features"
-msgstr "Funktionen"
-
-#: ../../include/apps.php:154
-msgid "Post"
-msgstr "Beitrag schreiben"
-
-#: ../../include/apps.php:252
-msgid "Install"
-msgstr "Installieren"
-
-#: ../../include/apps.php:257
-msgid "Purchase"
-msgstr "Kaufen"
-
-#: ../../include/network.php:659
-msgid "view full size"
-msgstr "In Vollbildansicht anschauen"
-
-#: ../../include/network.php:1827 ../../include/enotify.php:57
-msgid "$Projectname Notification"
-msgstr "$Projectname-Benachrichtigung"
-
-#: ../../include/network.php:1828 ../../include/enotify.php:58
-msgid "$projectname"
-msgstr "$projectname"
-
-#: ../../include/network.php:1830 ../../include/enotify.php:60
-msgid "Thank You,"
-msgstr "Danke."
-
-#: ../../include/network.php:1832 ../../include/enotify.php:62
+#: ../../include/contact_widgets.php:14
 #, php-format
-msgid "%s Administrator"
-msgstr "der Administrator von %s"
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] "%d Einladung verfügbar"
+msgstr[1] "%d Einladungen verfügbar"
 
-#: ../../include/network.php:1889
-msgid "No Subject"
-msgstr "Kein Betreff"
+#: ../../include/contact_widgets.php:22
+msgid "Find Channels"
+msgstr "Finde Kanäle"
 
-#: ../../include/bb2diaspora.php:398
-msgid "Attachments:"
-msgstr "Anhänge:"
+#: ../../include/contact_widgets.php:23
+msgid "Enter name or interest"
+msgstr "Name oder Interessen eingeben"
 
-#: ../../include/bb2diaspora.php:487 ../../include/event.php:22
-#: ../../include/text.php:1437
+#: ../../include/contact_widgets.php:24
+msgid "Connect/Follow"
+msgstr "Verbinden/Folgen"
+
+#: ../../include/contact_widgets.php:25
+msgid "Examples: Robert Morgenstein, Fishing"
+msgstr "Beispiele: Robert Morgenstein, Angeln"
+
+#: ../../include/contact_widgets.php:29
+msgid "Random Profile"
+msgstr "Zufallsprofil"
+
+#: ../../include/contact_widgets.php:30
+msgid "Invite Friends"
+msgstr "Lade Freunde ein"
+
+#: ../../include/contact_widgets.php:32
+msgid "Advanced example: name=fred and country=iceland"
+msgstr "Fortgeschrittenes Beispiel: name=fred and country=iceland"
+
+#: ../../include/contact_widgets.php:57 ../../include/widgets.php:310
+#: ../../include/features.php:97
+msgid "Saved Folders"
+msgstr "Gespeicherte Ordner"
+
+#: ../../include/contact_widgets.php:60 ../../include/contact_widgets.php:100
+#: ../../include/widgets.php:313 ../../include/widgets.php:432
+msgid "Everything"
+msgstr "Alles"
+
+#: ../../include/contact_widgets.php:97 ../../include/widgets.php:46
+#: ../../include/widgets.php:429 ../../include/taxonomy.php:188
+#: ../../include/taxonomy.php:270
+msgid "Categories"
+msgstr "Kategorien"
+
+#: ../../include/contact_widgets.php:130
+#, php-format
+msgid "%d connection in common"
+msgid_plural "%d connections in common"
+msgstr[0] "%d gemeinsame Verbindung"
+msgstr[1] "%d gemeinsame Verbindungen"
+
+#: ../../include/contact_widgets.php:135
+msgid "show more"
+msgstr "mehr zeigen"
+
+#: ../../include/event.php:22 ../../include/text.php:1466
+#: ../../include/bb2diaspora.php:487
 msgid "l F d, Y \\@ g:i A"
 msgstr "l, d. F Y, H:i"
 
-#: ../../include/bb2diaspora.php:489
-msgid "$Projectname event notification:"
-msgstr "$Projectname-Terminbenachrichtigung:"
-
-#: ../../include/bb2diaspora.php:493 ../../include/event.php:30
-#: ../../include/text.php:1441
+#: ../../include/event.php:30 ../../include/text.php:1470
+#: ../../include/bb2diaspora.php:493
 msgid "Starts:"
 msgstr "Beginnt:"
 
-#: ../../include/bb2diaspora.php:501 ../../include/event.php:40
-#: ../../include/text.php:1445
+#: ../../include/event.php:40 ../../include/text.php:1474
+#: ../../include/bb2diaspora.php:501
 msgid "Finishes:"
 msgstr "Endet:"
 
-#: ../../include/bbcode.php:123 ../../include/bbcode.php:801
-#: ../../include/bbcode.php:804 ../../include/bbcode.php:809
-#: ../../include/bbcode.php:812 ../../include/bbcode.php:815
-#: ../../include/bbcode.php:818 ../../include/bbcode.php:823
-#: ../../include/bbcode.php:826 ../../include/bbcode.php:831
-#: ../../include/bbcode.php:834 ../../include/bbcode.php:837
-#: ../../include/bbcode.php:840
-msgid "Image/photo"
-msgstr "Bild/Foto"
+#: ../../include/event.php:769
+msgid "This event has been added to your calendar."
+msgstr "Dieser Termin wurde zu Deinem Kalender hinzugefügt"
 
-#: ../../include/bbcode.php:162 ../../include/bbcode.php:851
-msgid "Encrypted content"
-msgstr "Verschlüsselter Inhalt"
+#: ../../include/event.php:968
+msgid "Not specified"
+msgstr "Keine Angabe"
 
-#: ../../include/bbcode.php:179
+#: ../../include/event.php:969
+msgid "Needs Action"
+msgstr "Aktion erforderlich"
+
+#: ../../include/event.php:970
+msgid "Completed"
+msgstr "Abgeschlossen"
+
+#: ../../include/event.php:971
+msgid "In Process"
+msgstr "In Bearbeitung"
+
+#: ../../include/event.php:972
+msgid "Cancelled"
+msgstr "gestrichen"
+
+#: ../../include/photos.php:112
 #, php-format
-msgid "Install %s element: "
-msgstr "Element %s installieren: "
+msgid "Image exceeds website size limit of %lu bytes"
+msgstr "Bild überschreitet das Webseitenlimit von %lu Bytes"
 
-#: ../../include/bbcode.php:183
+#: ../../include/photos.php:119
+msgid "Image file is empty."
+msgstr "Bilddatei ist leer."
+
+#: ../../include/photos.php:257
+msgid "Photo storage failed."
+msgstr "Fotospeicherung fehlgeschlagen."
+
+#: ../../include/photos.php:297
+msgid "a new photo"
+msgstr "ein neues Foto"
+
+#: ../../include/photos.php:301
 #, php-format
-msgid ""
-"This post contains an installable %s element, however you lack permissions "
-"to install it on this site."
-msgstr "Dieser Beitrag beinhaltet ein installierbares %s Element, aber Du hast nicht die nötigen Rechte, um es auf diesem Hub zu installieren."
+msgctxt "photo_upload"
+msgid "%1$s posted %2$s to %3$s"
+msgstr "%1$s hat %2$s auf %3$s veröffentlicht"
 
-#: ../../include/bbcode.php:255
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
-msgstr "%1$s schrieb den folgenden %2$s %3$s"
-
-#: ../../include/bbcode.php:545
-msgid "Different viewers will see this text differently"
-msgstr "Verschiedene Betrachter werden diesen Text unterschiedlich sehen"
-
-#: ../../include/bbcode.php:762
-msgid "$1 spoiler"
-msgstr "$1 Spoiler"
-
-#: ../../include/bbcode.php:789
-msgid "$1 wrote:"
-msgstr "$1 schrieb:"
-
-#: ../../include/conversation.php:204
-#, php-format
-msgid "%1$s is now connected with %2$s"
-msgstr "%1$s ist jetzt mit %2$s verbunden"
-
-#: ../../include/conversation.php:239
-#, php-format
-msgid "%1$s poked %2$s"
-msgstr "%1$s stupste %2$s an"
-
-#: ../../include/conversation.php:243 ../../include/text.php:992
-#: ../../include/text.php:997
-msgid "poked"
-msgstr "stupste"
-
-#: ../../include/conversation.php:691
-#, php-format
-msgid "View %s's profile @ %s"
-msgstr "%ss Profil auf %s ansehen"
-
-#: ../../include/conversation.php:710
-msgid "Categories:"
-msgstr "Kategorien:"
-
-#: ../../include/conversation.php:711
-msgid "Filed under:"
-msgstr "Gespeichert unter:"
-
-#: ../../include/conversation.php:738
-msgid "View in context"
-msgstr "Im Zusammenhang anschauen"
-
-#: ../../include/conversation.php:850
-msgid "remove"
-msgstr "lösche"
-
-#: ../../include/conversation.php:854 ../../include/nav.php:256
-msgid "Loading..."
-msgstr "Lädt ..."
-
-#: ../../include/conversation.php:855
-msgid "Delete Selected Items"
-msgstr "Lösche die ausgewählten Elemente"
-
-#: ../../include/conversation.php:953
-msgid "View Source"
-msgstr "Quelle anzeigen"
-
-#: ../../include/conversation.php:954
-msgid "Follow Thread"
-msgstr "Unterhaltung folgen"
-
-#: ../../include/conversation.php:955
-msgid "Unfollow Thread"
-msgstr "Unterhaltung nicht mehr folgen"
-
-#: ../../include/conversation.php:960
-msgid "Activity/Posts"
-msgstr "Aktivitäten/Beiträge"
-
-#: ../../include/conversation.php:962
-msgid "Edit Connection"
-msgstr "Verbindung bearbeiten"
-
-#: ../../include/conversation.php:963
-msgid "Message"
-msgstr "Nachricht"
-
-#: ../../include/conversation.php:1080
-#, php-format
-msgid "%s likes this."
-msgstr "%s gefällt das."
-
-#: ../../include/conversation.php:1080
-#, php-format
-msgid "%s doesn't like this."
-msgstr "%s gefällt das nicht."
-
-#: ../../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 Person</span> gefällt das."
-msgstr[1] "<span  %1$s>%2$d Leuten</span> gefällt das."
-
-#: ../../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 Person</span> gefällt das nicht."
-msgstr[1] "<span  %1$s>%2$d Leuten</span> gefällt das nicht."
-
-#: ../../include/conversation.php:1092
-msgid "and"
-msgstr "und"
-
-#: ../../include/conversation.php:1095
-#, php-format
-msgid ", and %d other people"
-msgid_plural ", and %d other people"
-msgstr[0] ""
-msgstr[1] ", und %d andere"
-
-#: ../../include/conversation.php:1096
-#, php-format
-msgid "%s like this."
-msgstr "%s gefällt das."
-
-#: ../../include/conversation.php:1096
-#, php-format
-msgid "%s don't like this."
-msgstr "%s gefällt das nicht."
-
-#: ../../include/conversation.php:1169
-msgid "Visible to <strong>everybody</strong>"
-msgstr "Sichtbar für <strong>jeden</strong>"
-
-#: ../../include/conversation.php:1171
-msgid "Please enter a video link/URL:"
-msgstr "Gib einen Video-Link/URL ein:"
-
-#: ../../include/conversation.php:1172
-msgid "Please enter an audio link/URL:"
-msgstr "Gib einen Audio-Link/URL ein:"
-
-#: ../../include/conversation.php:1173
-msgid "Tag term:"
-msgstr "Schlagwort:"
-
-#: ../../include/conversation.php:1175
-msgid "Where are you right now?"
-msgstr "Wo bist Du jetzt grade?"
-
-#: ../../include/conversation.php:1211
-msgid "Page link name"
-msgstr "Link zur Seite"
-
-#: ../../include/conversation.php:1214
-msgid "Post as"
-msgstr "Veröffentlichen als"
-
-#: ../../include/conversation.php:1222
-msgid "upload photo"
-msgstr "Foto hochladen"
-
-#: ../../include/conversation.php:1224
-msgid "attach file"
-msgstr "Datei anfügen"
-
-#: ../../include/conversation.php:1226
-msgid "web link"
-msgstr "Web-Link"
-
-#: ../../include/conversation.php:1227
-msgid "Insert video link"
-msgstr "Video-Link einfügen"
-
-#: ../../include/conversation.php:1228
-msgid "video link"
-msgstr "Video-Link"
-
-#: ../../include/conversation.php:1229
-msgid "Insert audio link"
-msgstr "Audio-Link einfügen"
-
-#: ../../include/conversation.php:1230
-msgid "audio link"
-msgstr "Audio-Link"
-
-#: ../../include/conversation.php:1232
-msgid "set location"
-msgstr "Standort"
-
-#: ../../include/conversation.php:1237
-msgid "clear location"
-msgstr "Standort löschen"
-
-#: ../../include/conversation.php:1246
-msgid "permissions"
-msgstr "Berechtigungen"
-
-#: ../../include/conversation.php:1272
-msgid "Set publish date"
-msgstr "Veröffentlichungsdatum festlegen"
-
-#: ../../include/conversation.php:1521
-msgid "Discover"
-msgstr "Entdecken"
-
-#: ../../include/conversation.php:1524
-msgid "Imported public streams"
-msgstr "Importierte öffentliche Beiträge"
-
-#: ../../include/conversation.php:1529
-msgid "Commented Order"
-msgstr "Neueste Kommentare"
-
-#: ../../include/conversation.php:1532
-msgid "Sort by Comment Date"
-msgstr "Nach Kommentardatum sortiert"
-
-#: ../../include/conversation.php:1536
-msgid "Posted Order"
-msgstr "Neueste Beiträge"
-
-#: ../../include/conversation.php:1539
-msgid "Sort by Post Date"
-msgstr "Nach Beitragsdatum sortiert"
-
-#: ../../include/conversation.php:1547
-msgid "Posts that mention or involve you"
-msgstr "Beiträge mit Beteiligung Deinerseits"
-
-#: ../../include/conversation.php:1556
-msgid "Activity Stream - by date"
-msgstr "Activity Stream – nach Datum sortiert"
-
-#: ../../include/conversation.php:1562
-msgid "Starred"
-msgstr "Markiert"
-
-#: ../../include/conversation.php:1565
-msgid "Favourite Posts"
-msgstr "Markierte Beiträge"
-
-#: ../../include/conversation.php:1572
-msgid "Spam"
-msgstr "Spam"
-
-#: ../../include/conversation.php:1575
-msgid "Posts flagged as SPAM"
-msgstr "Nachrichten, die als SPAM markiert wurden"
-
-#: ../../include/conversation.php:1632
-msgid "Status Messages and Posts"
-msgstr "Statusnachrichten und Beiträge"
-
-#: ../../include/conversation.php:1641
-msgid "About"
-msgstr "Ãœber"
-
-#: ../../include/conversation.php:1644
-msgid "Profile Details"
-msgstr "Profil-Details"
-
-#: ../../include/conversation.php:1653 ../../include/photos.php:506
+#: ../../include/photos.php:506 ../../include/conversation.php:1641
 msgid "Photo Albums"
 msgstr "Fotoalben"
 
-#: ../../include/conversation.php:1660
-msgid "Files and Storage"
-msgstr "Dateien und Speicher"
+#: ../../include/photos.php:510
+msgid "Upload New Photos"
+msgstr "Neue Fotos hochladen"
 
-#: ../../include/conversation.php:1681 ../../include/conversation.php:1684
-#: ../../include/widgets.php:794
+#: ../../include/import.php:27
+msgid ""
+"Cannot create a duplicate channel identifier on this system. Import failed."
+msgstr "Kann keinen doppelten Kanal-Identifikator auf diesem System erzeugen (Spitzname oder Hash schon belegt). Import fehlgeschlagen."
+
+#: ../../include/import.php:74
+msgid "Channel clone failed. Import failed."
+msgstr "Klonen des Kanals fehlgeschlagen. Import fehlgeschlagen."
+
+#: ../../include/zot.php:680
+msgid "Invalid data packet"
+msgstr "Ungültiges Datenpaket"
+
+#: ../../include/zot.php:696
+msgid "Unable to verify channel signature"
+msgstr "Konnte die Signatur des Kanals nicht verifizieren"
+
+#: ../../include/zot.php:2342
+#, php-format
+msgid "Unable to verify site signature for %s"
+msgstr "Kann die Signatur der Seite von %s nicht verifizieren"
+
+#: ../../include/zot.php:3680
+msgid "invalid target signature"
+msgstr "Ungültige Signatur des Ziels"
+
+#: ../../include/widgets.php:103
+msgid "System"
+msgstr "System"
+
+#: ../../include/widgets.php:106
+msgid "New App"
+msgstr "Neue App"
+
+#: ../../include/widgets.php:154
+msgid "Suggestions"
+msgstr "Vorschläge"
+
+#: ../../include/widgets.php:155
+msgid "See more..."
+msgstr "Mehr anzeigen …"
+
+#: ../../include/widgets.php:175
+#, php-format
+msgid "You have %1$.0f of %2$.0f allowed connections."
+msgstr "Du bist %1$.0f von maximal %2$.0f erlaubten Verbindungen eingegangen."
+
+#: ../../include/widgets.php:181
+msgid "Add New Connection"
+msgstr "Neue Verbindung hinzufügen"
+
+#: ../../include/widgets.php:182
+msgid "Enter channel address"
+msgstr "Adresse des Kanals eingeben"
+
+#: ../../include/widgets.php:183
+msgid "Examples: bob@example.com, https://example.com/barbara"
+msgstr "Beispiele: bob@beispiel.com, http://beispiel.com/barbara"
+
+#: ../../include/widgets.php:199
+msgid "Notes"
+msgstr "Notizen"
+
+#: ../../include/widgets.php:273
+msgid "Remove term"
+msgstr "Eintrag löschen"
+
+#: ../../include/widgets.php:281 ../../include/features.php:84
+msgid "Saved Searches"
+msgstr "Gespeicherte Suchanfragen"
+
+#: ../../include/widgets.php:282 ../../include/group.php:316
+msgid "add"
+msgstr "hinzufügen"
+
+#: ../../include/widgets.php:354
+msgid "Archives"
+msgstr "Archive"
+
+#: ../../include/widgets.php:516
+msgid "Refresh"
+msgstr "Aktualisieren"
+
+#: ../../include/widgets.php:556
+msgid "Account settings"
+msgstr "Konto-Einstellungen"
+
+#: ../../include/widgets.php:562
+msgid "Channel settings"
+msgstr "Kanal-Einstellungen"
+
+#: ../../include/widgets.php:571
+msgid "Additional features"
+msgstr "Zusätzliche Funktionen"
+
+#: ../../include/widgets.php:578
+msgid "Feature/Addon settings"
+msgstr "Plugin-Einstellungen"
+
+#: ../../include/widgets.php:584
+msgid "Display settings"
+msgstr "Anzeige-Einstellungen"
+
+#: ../../include/widgets.php:591
+msgid "Manage locations"
+msgstr "Klon-Adressen verwalten"
+
+#: ../../include/widgets.php:600
+msgid "Export channel"
+msgstr "Kanal exportieren"
+
+#: ../../include/widgets.php:607
+msgid "Connected apps"
+msgstr "Verbundene Apps"
+
+#: ../../include/widgets.php:622
+msgid "Premium Channel Settings"
+msgstr "Premium-Kanal-Einstellungen"
+
+#: ../../include/widgets.php:651
+msgid "Private Mail Menu"
+msgstr "Private Nachrichten"
+
+#: ../../include/widgets.php:653
+msgid "Combined View"
+msgstr "Kombinierte Anzeige"
+
+#: ../../include/widgets.php:658 ../../include/nav.php:196
+msgid "Inbox"
+msgstr "Eingang"
+
+#: ../../include/widgets.php:663 ../../include/nav.php:197
+msgid "Outbox"
+msgstr "Ausgang"
+
+#: ../../include/widgets.php:668 ../../include/nav.php:198
+msgid "New Message"
+msgstr "Neue Nachricht"
+
+#: ../../include/widgets.php:685 ../../include/widgets.php:697
+msgid "Conversations"
+msgstr "Konversationen"
+
+#: ../../include/widgets.php:689
+msgid "Received Messages"
+msgstr "Erhaltene Nachrichten"
+
+#: ../../include/widgets.php:693
+msgid "Sent Messages"
+msgstr "Gesendete Nachrichten"
+
+#: ../../include/widgets.php:707
+msgid "No messages."
+msgstr "Keine Nachrichten."
+
+#: ../../include/widgets.php:725
+msgid "Delete conversation"
+msgstr "Unterhaltung löschen"
+
+#: ../../include/widgets.php:751
+msgid "Events Menu"
+msgstr "Kalendermenü"
+
+#: ../../include/widgets.php:752
+msgid "Day View"
+msgstr "Tagesansicht"
+
+#: ../../include/widgets.php:753
+msgid "Week View"
+msgstr "Wochenansicht"
+
+#: ../../include/widgets.php:754
+msgid "Month View"
+msgstr "Monatsansicht"
+
+#: ../../include/widgets.php:766
+msgid "Events Tools"
+msgstr "Kalenderwerkzeuge"
+
+#: ../../include/widgets.php:767
+msgid "Export Calendar"
+msgstr "Kalender exportieren"
+
+#: ../../include/widgets.php:768
+msgid "Import Calendar"
+msgstr "Kalender importieren"
+
+#: ../../include/widgets.php:843 ../../include/conversation.php:1669
+#: ../../include/conversation.php:1672
 msgid "Chatrooms"
 msgstr "Chaträume"
 
-#: ../../include/conversation.php:1697
-msgid "Saved Bookmarks"
-msgstr "Gespeicherte Lesezeichen"
+#: ../../include/widgets.php:847
+msgid "Overview"
+msgstr "Ãœbersicht"
 
-#: ../../include/conversation.php:1707
-msgid "Manage Webpages"
-msgstr "Webseiten verwalten"
+#: ../../include/widgets.php:854
+msgid "Chat Members"
+msgstr "Chatmitglieder"
 
-#: ../../include/conversation.php:1766
-msgctxt "noun"
-msgid "Attending"
-msgid_plural "Attending"
-msgstr[0] "Zusage"
-msgstr[1] "Zusagen"
+#: ../../include/widgets.php:877
+msgid "Bookmarked Chatrooms"
+msgstr "Gespeicherte Chatrooms"
 
-#: ../../include/conversation.php:1769
-msgctxt "noun"
-msgid "Not Attending"
-msgid_plural "Not Attending"
-msgstr[0] "Absage"
-msgstr[1] "Absagen"
+#: ../../include/widgets.php:900
+msgid "Suggested Chatrooms"
+msgstr "Chatraum-Vorschläge"
 
-#: ../../include/conversation.php:1772
-msgctxt "noun"
-msgid "Undecided"
-msgid_plural "Undecided"
-msgstr[0] " Unentschlossen"
-msgstr[1] "Unentschlossene"
+#: ../../include/widgets.php:1045 ../../include/widgets.php:1157
+msgid "photo/image"
+msgstr "Foto/Bild"
 
-#: ../../include/conversation.php:1775
-msgctxt "noun"
-msgid "Agree"
-msgid_plural "Agrees"
-msgstr[0] "Zustimmung"
-msgstr[1] "Zustimmungen"
+#: ../../include/widgets.php:1100
+msgid "Click to show more"
+msgstr "Klick, um mehr anzuzeigen"
 
-#: ../../include/conversation.php:1778
-msgctxt "noun"
-msgid "Disagree"
-msgid_plural "Disagrees"
-msgstr[0] "Ablehnung"
-msgstr[1] "Ablehnungen"
+#: ../../include/widgets.php:1251
+msgid "Rating Tools"
+msgstr "Bewertungswerkzeuge"
 
-#: ../../include/conversation.php:1781
-msgctxt "noun"
-msgid "Abstain"
-msgid_plural "Abstains"
-msgstr[0] "Enthaltung"
-msgstr[1] "Enthaltungen"
+#: ../../include/widgets.php:1255 ../../include/widgets.php:1257
+msgid "Rate Me"
+msgstr "Bewerte mich"
+
+#: ../../include/widgets.php:1260
+msgid "View Ratings"
+msgstr "Bewertungen ansehen"
+
+#: ../../include/widgets.php:1317
+msgid "Forums"
+msgstr "Foren"
+
+#: ../../include/widgets.php:1346
+msgid "Tasks"
+msgstr "Aufgaben"
+
+#: ../../include/widgets.php:1355
+msgid "Documentation"
+msgstr "Dokumentation"
+
+#: ../../include/widgets.php:1357
+msgid "Project/Site Information"
+msgstr "Informationen über das Projekt und diesen Hub"
+
+#: ../../include/widgets.php:1358
+msgid "For Members"
+msgstr "Für Mitglieder"
+
+#: ../../include/widgets.php:1359
+msgid "For Administrators"
+msgstr "Für Administratoren"
+
+#: ../../include/widgets.php:1360
+msgid "For Developers"
+msgstr "Für Entwickler"
+
+#: ../../include/widgets.php:1384
+msgid "Accounts"
+msgstr "Konten"
+
+#: ../../include/widgets.php:1384 ../../include/widgets.php:1422
+msgid "Member registrations waiting for confirmation"
+msgstr "Nutzer-Anmeldungen, die auf Bestätigung warten"
+
+#: ../../include/widgets.php:1387 ../../include/apps.php:184
+msgid "Features"
+msgstr "Funktionen"
+
+#: ../../include/widgets.php:1390
+msgid "Inspect queue"
+msgstr "Warteschlange kontrollieren"
+
+#: ../../include/widgets.php:1392
+msgid "DB updates"
+msgstr "DB-Aktualisierungen"
+
+#: ../../include/widgets.php:1417 ../../include/nav.php:216
+msgid "Admin"
+msgstr "Administration"
+
+#: ../../include/widgets.php:1418
+msgid "Plugin Features"
+msgstr "Plug-In Funktionen"
 
 #: ../../include/bookmarks.php:35
 #, php-format
@@ -7566,6 +7243,288 @@ msgid ""
 "form has been opened for too long (>3 hours) before submitting it."
 msgstr "Das Security-Token des Formulars war nicht korrekt. Das ist wahrscheinlich passiert, weil das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde."
 
+#: ../../include/items.php:890 ../../include/items.php:935
+msgid "(Unknown)"
+msgstr "(Unbekannt)"
+
+#: ../../include/items.php:1134
+msgid "Visible to anybody on the internet."
+msgstr "Für jeden im Internet sichtbar."
+
+#: ../../include/items.php:1136
+msgid "Visible to you only."
+msgstr "Nur für Dich sichtbar."
+
+#: ../../include/items.php:1138
+msgid "Visible to anybody in this network."
+msgstr "Für jedes $Projectname-Mitglied sichtbar."
+
+#: ../../include/items.php:1140
+msgid "Visible to anybody authenticated."
+msgstr "Für jeden sichtbar, der angemeldet ist."
+
+#: ../../include/items.php:1142
+#, php-format
+msgid "Visible to anybody on %s."
+msgstr "Für jeden auf %s sichtbar."
+
+#: ../../include/items.php:1144
+msgid "Visible to all connections."
+msgstr "Für alle Verbindungen sichtbar."
+
+#: ../../include/items.php:1146
+msgid "Visible to approved connections."
+msgstr "Nur für akzeptierte Verbindungen sichtbar."
+
+#: ../../include/items.php:1148
+msgid "Visible to specific connections."
+msgstr "Sichtbar für bestimmte Verbindungen."
+
+#: ../../include/items.php:3910
+msgid "Privacy group is empty."
+msgstr "Gruppe ist leer."
+
+#: ../../include/items.php:3917
+#, php-format
+msgid "Privacy group: %s"
+msgstr "Gruppe: %s"
+
+#: ../../include/items.php:3929
+msgid "Connection not found."
+msgstr "Die Verbindung wurde nicht gefunden."
+
+#: ../../include/items.php:4278
+msgid "profile photo"
+msgstr "Profilfoto"
+
+#: ../../include/nav.php:82 ../../include/nav.php:113 ../../boot.php:1614
+msgid "Logout"
+msgstr "Abmelden"
+
+#: ../../include/nav.php:82 ../../include/nav.php:113
+msgid "End this session"
+msgstr "Beende diese Sitzung"
+
+#: ../../include/nav.php:85 ../../include/nav.php:144
+msgid "Home"
+msgstr "Home"
+
+#: ../../include/nav.php:85
+msgid "Your posts and conversations"
+msgstr "Deine Beiträge und Unterhaltungen"
+
+#: ../../include/nav.php:86
+msgid "Your profile page"
+msgstr "Deine Profilseite"
+
+#: ../../include/nav.php:88
+msgid "Manage/Edit profiles"
+msgstr "Profile verwalten"
+
+#: ../../include/nav.php:90
+msgid "Edit your profile"
+msgstr "Profil bearbeiten"
+
+#: ../../include/nav.php:92
+msgid "Your photos"
+msgstr "Deine Bilder"
+
+#: ../../include/nav.php:93
+msgid "Your files"
+msgstr "Deine Dateien"
+
+#: ../../include/nav.php:96 ../../include/apps.php:178
+msgid "Chat"
+msgstr "Chat"
+
+#: ../../include/nav.php:96
+msgid "Your chatrooms"
+msgstr "Deine Chaträume"
+
+#: ../../include/nav.php:102 ../../include/conversation.php:1682
+msgid "Bookmarks"
+msgstr "Lesezeichen"
+
+#: ../../include/nav.php:102
+msgid "Your bookmarks"
+msgstr "Deine Lesezeichen"
+
+#: ../../include/nav.php:106
+msgid "Your webpages"
+msgstr "Deine Webseiten"
+
+#: ../../include/nav.php:110 ../../include/apps.php:163 ../../boot.php:1615
+msgid "Login"
+msgstr "Anmelden"
+
+#: ../../include/nav.php:110
+msgid "Sign in"
+msgstr "Anmelden"
+
+#: ../../include/nav.php:127
+#, php-format
+msgid "%s - click to logout"
+msgstr "%s - Klick zum Abmelden"
+
+#: ../../include/nav.php:130
+msgid "Remote authentication"
+msgstr "Ãœber Konto auf anderem Server einloggen"
+
+#: ../../include/nav.php:130
+msgid "Click to authenticate to your home hub"
+msgstr "Klicke, um Dich über Deinen Heimat-Server zu authentifizieren"
+
+#: ../../include/nav.php:144
+msgid "Home Page"
+msgstr "Homepage"
+
+#: ../../include/nav.php:147
+msgid "Create an account"
+msgstr "Erzeuge ein Konto"
+
+#: ../../include/nav.php:159
+msgid "Help and documentation"
+msgstr "Hilfe und Dokumentation"
+
+#: ../../include/nav.php:163
+msgid "Applications, utilities, links, games"
+msgstr "Anwendungen (Apps), Zubehör, Links, Spiele"
+
+#: ../../include/nav.php:165
+msgid "Search site @name, #tag, ?docs, content"
+msgstr "Hub durchsuchen: @Name. #Schlagwort, ?Dokumentation, Inhalt"
+
+#: ../../include/nav.php:167 ../../include/apps.php:173
+msgid "Directory"
+msgstr "Verzeichnis"
+
+#: ../../include/nav.php:167
+msgid "Channel Directory"
+msgstr "Kanal-Verzeichnis"
+
+#: ../../include/nav.php:179 ../../include/apps.php:165
+msgid "Grid"
+msgstr "Grid"
+
+#: ../../include/nav.php:179
+msgid "Your grid"
+msgstr "Dein Grid"
+
+#: ../../include/nav.php:180
+msgid "Mark all grid notifications seen"
+msgstr "Alle Grid-Benachrichtigungen als angesehen markieren"
+
+#: ../../include/nav.php:182 ../../include/apps.php:169
+msgid "Channel Home"
+msgstr "Mein Kanal"
+
+#: ../../include/nav.php:182
+msgid "Channel home"
+msgstr "Mein Kanal"
+
+#: ../../include/nav.php:183
+msgid "Mark all channel notifications seen"
+msgstr "Markiere alle Kanal-Benachrichtigungen als angesehen"
+
+#: ../../include/nav.php:189
+msgid "Notices"
+msgstr "Benachrichtigungen"
+
+#: ../../include/nav.php:189
+msgid "Notifications"
+msgstr "Benachrichtigungen"
+
+#: ../../include/nav.php:190
+msgid "See all notifications"
+msgstr "Alle Benachrichtigungen ansehen"
+
+#: ../../include/nav.php:193 ../../include/apps.php:175
+msgid "Mail"
+msgstr "Mail"
+
+#: ../../include/nav.php:193
+msgid "Private mail"
+msgstr "Persönliche Mail"
+
+#: ../../include/nav.php:194
+msgid "See all private messages"
+msgstr "Alle persönlichen Nachrichten ansehen"
+
+#: ../../include/nav.php:195
+msgid "Mark all private messages seen"
+msgstr "Markiere alle persönlichen Nachrichten als gesehen"
+
+#: ../../include/nav.php:201 ../../include/conversation.php:1655
+#: ../../include/conversation.php:1658 ../../include/apps.php:172
+msgid "Events"
+msgstr "Termine"
+
+#: ../../include/nav.php:201
+msgid "Event Calendar"
+msgstr "Terminkalender"
+
+#: ../../include/nav.php:202
+msgid "See all events"
+msgstr "Alle Termine ansehen"
+
+#: ../../include/nav.php:203
+msgid "Mark all events seen"
+msgstr "Markiere alle Termine als gesehen"
+
+#: ../../include/nav.php:206
+msgid "Manage Your Channels"
+msgstr "Verwalte Deine Kanäle"
+
+#: ../../include/nav.php:208
+msgid "Account/Channel Settings"
+msgstr "Konto-/Kanal-Einstellungen"
+
+#: ../../include/nav.php:216
+msgid "Site Setup and Configuration"
+msgstr "Seiten-Einrichtung und -Konfiguration"
+
+#: ../../include/nav.php:247 ../../include/conversation.php:854
+msgid "Loading..."
+msgstr "Lädt ..."
+
+#: ../../include/nav.php:252
+msgid "@name, #tag, ?doc, content"
+msgstr "@Name, #Schlagwort, ?Dokumentation, Inhalt"
+
+#: ../../include/nav.php:253
+msgid "Please wait..."
+msgstr "Bitte warten..."
+
+#: ../../include/network.php:659
+msgid "view full size"
+msgstr "In Vollbildansicht anschauen"
+
+#: ../../include/network.php:1827 ../../include/enotify.php:57
+msgid "$Projectname Notification"
+msgstr "$Projectname-Benachrichtigung"
+
+#: ../../include/network.php:1828 ../../include/enotify.php:58
+msgid "$projectname"
+msgstr "$projectname"
+
+#: ../../include/network.php:1830 ../../include/enotify.php:60
+msgid "Thank You,"
+msgstr "Danke."
+
+#: ../../include/network.php:1832 ../../include/enotify.php:62
+#, php-format
+msgid "%s Administrator"
+msgstr "der Administrator von %s"
+
+#: ../../include/network.php:1875 ../../include/account.php:317
+#: ../../include/account.php:344 ../../include/account.php:404
+msgid "Administrator"
+msgstr "Administrator"
+
+#: ../../include/network.php:1889
+msgid "No Subject"
+msgstr "Kein Betreff"
+
 #: ../../include/contact_selectors.php:56
 msgid "Frequently"
 msgstr "Häufig"
@@ -7631,67 +7590,6 @@ msgstr "XMPP/IM"
 msgid "MySpace"
 msgstr "MySpace"
 
-#: ../../include/contact_widgets.php:14
-#, php-format
-msgid "%d invitation available"
-msgid_plural "%d invitations available"
-msgstr[0] "%d Einladung verfügbar"
-msgstr[1] "%d Einladungen verfügbar"
-
-#: ../../include/contact_widgets.php:22
-msgid "Find Channels"
-msgstr "Finde Kanäle"
-
-#: ../../include/contact_widgets.php:23
-msgid "Enter name or interest"
-msgstr "Name oder Interessen eingeben"
-
-#: ../../include/contact_widgets.php:24
-msgid "Connect/Follow"
-msgstr "Verbinden/Folgen"
-
-#: ../../include/contact_widgets.php:25
-msgid "Examples: Robert Morgenstein, Fishing"
-msgstr "Beispiele: Robert Morgenstein, Angeln"
-
-#: ../../include/contact_widgets.php:29
-msgid "Random Profile"
-msgstr "Zufallsprofil"
-
-#: ../../include/contact_widgets.php:30
-msgid "Invite Friends"
-msgstr "Lade Freunde ein"
-
-#: ../../include/contact_widgets.php:32
-msgid "Advanced example: name=fred and country=iceland"
-msgstr "Fortgeschrittenes Beispiel: name=fred and country=iceland"
-
-#: ../../include/contact_widgets.php:57 ../../include/features.php:97
-#: ../../include/widgets.php:310
-msgid "Saved Folders"
-msgstr "Gespeicherte Ordner"
-
-#: ../../include/contact_widgets.php:60 ../../include/contact_widgets.php:98
-#: ../../include/widgets.php:313
-msgid "Everything"
-msgstr "Alles"
-
-#: ../../include/contact_widgets.php:95 ../../include/widgets.php:46
-#: ../../include/taxonomy.php:282
-msgid "Categories"
-msgstr "Kategorien"
-
-#: ../../include/contact_widgets.php:128
-#, php-format
-msgid "%d connection in common"
-msgid_plural "%d connections in common"
-msgstr[0] "%d gemeinsame Verbindung"
-msgstr[1] "%d gemeinsame Verbindungen"
-
-#: ../../include/contact_widgets.php:133
-msgid "show more"
-msgstr "mehr zeigen"
-
 #: ../../include/attach.php:247 ../../include/attach.php:333
 msgid "Item was not found."
 msgstr "Beitrag wurde nicht gefunden."
@@ -7766,7 +7664,7 @@ msgstr "Alter:"
 msgid "YYYY-MM-DD or MM-DD"
 msgstr "JJJJ-MM-TT oder MM-TT"
 
-#: ../../include/datetime.php:273 ../../boot.php:2432
+#: ../../include/datetime.php:273 ../../boot.php:2463
 msgid "never"
 msgstr "Nie"
 
@@ -8034,29 +7932,180 @@ msgstr "Bitte besuche %s um den Vorschlag zu akzeptieren oder abzulehnen."
 msgid "[Hubzilla:Notify]"
 msgstr "[Hubzilla:Benachrichtigung]"
 
-#: ../../include/event.php:779
-msgid "This event has been added to your calendar."
-msgstr "Dieser Termin wurde zu Deinem Kalender hinzugefügt"
+#: ../../include/ItemObject.php:89 ../../include/conversation.php:664
+msgid "Private Message"
+msgstr "Private Nachricht"
 
-#: ../../include/event.php:978
-msgid "Not specified"
-msgstr "Keine Angabe"
+#: ../../include/ItemObject.php:126 ../../include/conversation.php:656
+msgid "Select"
+msgstr "Auswählen"
 
-#: ../../include/event.php:979
-msgid "Needs Action"
-msgstr "Aktion erforderlich"
+#: ../../include/ItemObject.php:130
+msgid "Save to Folder"
+msgstr "In Ordner speichern"
 
-#: ../../include/event.php:980
-msgid "Completed"
-msgstr "Abgeschlossen"
+#: ../../include/ItemObject.php:151
+msgid "I will attend"
+msgstr "Ich werde teilnehmen"
 
-#: ../../include/event.php:981
-msgid "In Process"
-msgstr "In Bearbeitung"
+#: ../../include/ItemObject.php:151
+msgid "I will not attend"
+msgstr "Ich werde nicht teilnehmen"
 
-#: ../../include/event.php:982
-msgid "Cancelled"
-msgstr "gestrichen"
+#: ../../include/ItemObject.php:151
+msgid "I might attend"
+msgstr "Ich werde vielleicht teilnehmen"
+
+#: ../../include/ItemObject.php:161
+msgid "I agree"
+msgstr "Ich stimme zu"
+
+#: ../../include/ItemObject.php:161
+msgid "I disagree"
+msgstr "Ich lehne ab"
+
+#: ../../include/ItemObject.php:161
+msgid "I abstain"
+msgstr "Ich enthalte mich"
+
+#: ../../include/ItemObject.php:212
+msgid "Add Star"
+msgstr "Stern hinzufügen"
+
+#: ../../include/ItemObject.php:213
+msgid "Remove Star"
+msgstr "Stern entfernen"
+
+#: ../../include/ItemObject.php:214
+msgid "Toggle Star Status"
+msgstr "Markierungsstatus (Stern) umschalten"
+
+#: ../../include/ItemObject.php:218
+msgid "starred"
+msgstr "markiert"
+
+#: ../../include/ItemObject.php:227 ../../include/conversation.php:671
+msgid "Message signature validated"
+msgstr "Signatur überprüft"
+
+#: ../../include/ItemObject.php:228 ../../include/conversation.php:672
+msgid "Message signature incorrect"
+msgstr "Signatur nicht korrekt"
+
+#: ../../include/ItemObject.php:236
+msgid "Add Tag"
+msgstr "Tag hinzufügen"
+
+#: ../../include/ItemObject.php:254 ../../include/taxonomy.php:316
+msgid "like"
+msgstr "mag"
+
+#: ../../include/ItemObject.php:255 ../../include/taxonomy.php:317
+msgid "dislike"
+msgstr "verurteile"
+
+#: ../../include/ItemObject.php:259
+msgid "Share This"
+msgstr "Teilen"
+
+#: ../../include/ItemObject.php:259
+msgid "share"
+msgstr "Teilen"
+
+#: ../../include/ItemObject.php:268
+msgid "Delivery Report"
+msgstr "Zustellungsbericht"
+
+#: ../../include/ItemObject.php:286
+#, php-format
+msgid "%d comment"
+msgid_plural "%d comments"
+msgstr[0] "%d Kommentar"
+msgstr[1] "%d Kommentare"
+
+#: ../../include/ItemObject.php:315 ../../include/ItemObject.php:316
+#, php-format
+msgid "View %s's profile - %s"
+msgstr "Schaue Dir %ss Profil an – %s"
+
+#: ../../include/ItemObject.php:319
+msgid "to"
+msgstr "an"
+
+#: ../../include/ItemObject.php:320
+msgid "via"
+msgstr "via"
+
+#: ../../include/ItemObject.php:321
+msgid "Wall-to-Wall"
+msgstr "Wall-to-Wall"
+
+#: ../../include/ItemObject.php:322
+msgid "via Wall-To-Wall:"
+msgstr "via Wall-To-Wall:"
+
+#: ../../include/ItemObject.php:334 ../../include/conversation.php:719
+#, php-format
+msgid "from %s"
+msgstr "via %s"
+
+#: ../../include/ItemObject.php:337 ../../include/conversation.php:722
+#, php-format
+msgid "last edited: %s"
+msgstr "zuletzt bearbeitet: %s"
+
+#: ../../include/ItemObject.php:338 ../../include/conversation.php:723
+#, php-format
+msgid "Expires: %s"
+msgstr "Verfällt: %s"
+
+#: ../../include/ItemObject.php:362
+msgid "Save Bookmarks"
+msgstr "Favoriten speichern"
+
+#: ../../include/ItemObject.php:363
+msgid "Add to Calendar"
+msgstr "Zum Kalender hinzufügen"
+
+#: ../../include/ItemObject.php:372
+msgid "Mark all seen"
+msgstr "Alle als gelesen markieren"
+
+#: ../../include/ItemObject.php:413 ../../include/js_strings.php:7
+msgid "[+] show all"
+msgstr "[+] Alle anzeigen"
+
+#: ../../include/ItemObject.php:704 ../../include/conversation.php:1221
+msgid "Bold"
+msgstr "Fett"
+
+#: ../../include/ItemObject.php:705 ../../include/conversation.php:1222
+msgid "Italic"
+msgstr "Kursiv"
+
+#: ../../include/ItemObject.php:706 ../../include/conversation.php:1223
+msgid "Underline"
+msgstr "Unterstrichen"
+
+#: ../../include/ItemObject.php:707 ../../include/conversation.php:1224
+msgid "Quote"
+msgstr "Zitat"
+
+#: ../../include/ItemObject.php:708 ../../include/conversation.php:1225
+msgid "Code"
+msgstr "Code"
+
+#: ../../include/ItemObject.php:709
+msgid "Image"
+msgstr "Bild"
+
+#: ../../include/ItemObject.php:710
+msgid "Insert Link"
+msgstr "Link einfügen"
+
+#: ../../include/ItemObject.php:711
+msgid "Video"
+msgstr "Video"
 
 #: ../../include/features.php:48
 msgid "General Features"
@@ -8245,10 +8294,6 @@ msgstr "Gruppen"
 msgid "Enable management and selection of privacy groups"
 msgstr "Auswahl und Verwaltung von Gruppen für Kanäle aktivieren"
 
-#: ../../include/features.php:84 ../../include/widgets.php:281
-msgid "Saved Searches"
-msgstr "Gespeicherte Suchanfragen"
-
 #: ../../include/features.php:84
 msgid "Save search terms for re-use"
 msgstr "Ermöglicht das Abspeichern von Suchbegriffen zur Wiederverwendung"
@@ -8285,7 +8330,7 @@ msgstr "Filter für Verbindungen"
 msgid "Filter incoming posts from connections based on keywords/content"
 msgstr "Ermöglicht die Filterung eingehender Beiträge anhand von Schlüsselwörtern (muss an der Verbindung konfiguriert werden)"
 
-#: ../../include/features.php:89
+#: ../../include/features.php:89 ../../include/apps.php:162
 msgid "Suggest Channels"
 msgstr "Kanäle vorschlagen"
 
@@ -8396,368 +8441,762 @@ msgstr "Gruppe hinzufügen"
 msgid "Channels not in any privacy group"
 msgstr "Kanäle, die in keiner Gruppe sind"
 
-#: ../../include/group.php:316 ../../include/widgets.php:282
-msgid "add"
-msgstr "hinzufügen"
+#: ../../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 "Bild/Foto"
 
-#: ../../include/items.php:1138 ../../include/items.php:1183
-msgid "(Unknown)"
-msgstr "(Unbekannt)"
+#: ../../include/bbcode.php:162 ../../include/bbcode.php:898
+msgid "Encrypted content"
+msgstr "Verschlüsselter Inhalt"
 
-#: ../../include/items.php:1382
-msgid "Visible to anybody on the internet."
-msgstr "Für jeden im Internet sichtbar."
-
-#: ../../include/items.php:1384
-msgid "Visible to you only."
-msgstr "Nur für Dich sichtbar."
-
-#: ../../include/items.php:1386
-msgid "Visible to anybody in this network."
-msgstr "Für jedes $Projectname-Mitglied sichtbar."
-
-#: ../../include/items.php:1388
-msgid "Visible to anybody authenticated."
-msgstr "Für jeden sichtbar, der angemeldet ist."
-
-#: ../../include/items.php:1390
+#: ../../include/bbcode.php:179
 #, php-format
-msgid "Visible to anybody on %s."
-msgstr "Für jeden auf %s sichtbar."
+msgid "Install %s element: "
+msgstr "Element %s installieren: "
 
-#: ../../include/items.php:1392
-msgid "Visible to all connections."
-msgstr "Für alle Verbindungen sichtbar."
-
-#: ../../include/items.php:1394
-msgid "Visible to approved connections."
-msgstr "Nur für akzeptierte Verbindungen sichtbar."
-
-#: ../../include/items.php:1396
-msgid "Visible to specific connections."
-msgstr "Sichtbar für bestimmte Verbindungen."
-
-#: ../../include/items.php:5142
-msgid "Privacy group is empty."
-msgstr "Gruppe ist leer."
-
-#: ../../include/items.php:5149
+#: ../../include/bbcode.php:183
 #, php-format
-msgid "Privacy group: %s"
-msgstr "Gruppe: %s"
+msgid ""
+"This post contains an installable %s element, however you lack permissions "
+"to install it on this site."
+msgstr "Dieser Beitrag beinhaltet ein installierbares %s Element, aber Du hast nicht die nötigen Rechte, um es auf diesem Hub zu installieren."
 
-#: ../../include/items.php:5161
-msgid "Connection not found."
-msgstr "Die Verbindung wurde nicht gefunden."
-
-#: ../../include/items.php:5594
-msgid "profile photo"
-msgstr "Profilfoto"
-
-#: ../../include/photos.php:112
+#: ../../include/bbcode.php:255
 #, php-format
-msgid "Image exceeds website size limit of %lu bytes"
-msgstr "Bild überschreitet das Webseitenlimit von %lu Bytes"
+msgid "%1$s wrote the following %2$s %3$s"
+msgstr "%1$s schrieb den folgenden %2$s %3$s"
 
-#: ../../include/photos.php:119
-msgid "Image file is empty."
-msgstr "Bilddatei ist leer."
+#: ../../include/bbcode.php:333 ../../include/bbcode.php:341
+msgid "Click to open/close"
+msgstr "Klicke zum Öffnen/Schließen"
 
-#: ../../include/photos.php:257
-msgid "Photo storage failed."
-msgstr "Fotospeicherung fehlgeschlagen."
+#: ../../include/bbcode.php:341
+msgid "spoiler"
+msgstr "Spoiler"
 
-#: ../../include/photos.php:297
-msgid "a new photo"
-msgstr "ein neues Foto"
+#: ../../include/bbcode.php:586
+msgid "Different viewers will see this text differently"
+msgstr "Verschiedene Betrachter werden diesen Text unterschiedlich sehen"
 
-#: ../../include/photos.php:301
+#: ../../include/bbcode.php:836
+msgid "$1 wrote:"
+msgstr "$1 schrieb:"
+
+#: ../../include/conversation.php:204
 #, php-format
-msgctxt "photo_upload"
-msgid "%1$s posted %2$s to %3$s"
-msgstr "%1$s hat %2$s auf %3$s veröffentlicht"
+msgid "%1$s is now connected with %2$s"
+msgstr "%1$s ist jetzt mit %2$s verbunden"
 
-#: ../../include/photos.php:510
-msgid "Upload New Photos"
-msgstr "Neue Fotos hochladen"
-
-#: ../../include/widgets.php:103
-msgid "System"
-msgstr "System"
-
-#: ../../include/widgets.php:106
-msgid "Create Personal App"
-msgstr "Persönliche App erstellen"
-
-#: ../../include/widgets.php:107
-msgid "Edit Personal App"
-msgstr "Persönliche App bearbeiten"
-
-#: ../../include/widgets.php:154
-msgid "Suggestions"
-msgstr "Vorschläge"
-
-#: ../../include/widgets.php:155
-msgid "See more..."
-msgstr "Mehr anzeigen …"
-
-#: ../../include/widgets.php:175
+#: ../../include/conversation.php:239
 #, php-format
-msgid "You have %1$.0f of %2$.0f allowed connections."
-msgstr "Du bist %1$.0f von maximal %2$.0f erlaubten Verbindungen eingegangen."
+msgid "%1$s poked %2$s"
+msgstr "%1$s stupste %2$s an"
 
-#: ../../include/widgets.php:181
-msgid "Add New Connection"
-msgstr "Neue Verbindung hinzufügen"
+#: ../../include/conversation.php:243 ../../include/text.php:1021
+#: ../../include/text.php:1026
+msgid "poked"
+msgstr "stupste"
 
-#: ../../include/widgets.php:182
-msgid "Enter channel address"
-msgstr "Adresse des Kanals eingeben"
+#: ../../include/conversation.php:691
+#, php-format
+msgid "View %s's profile @ %s"
+msgstr "%ss Profil auf %s ansehen"
 
-#: ../../include/widgets.php:183
-msgid "Examples: bob@example.com, https://example.com/barbara"
-msgstr "Beispiele: bob@beispiel.com, http://beispiel.com/barbara"
+#: ../../include/conversation.php:710
+msgid "Categories:"
+msgstr "Kategorien:"
 
-#: ../../include/widgets.php:199
-msgid "Notes"
-msgstr "Notizen"
+#: ../../include/conversation.php:711
+msgid "Filed under:"
+msgstr "Gespeichert unter:"
 
-#: ../../include/widgets.php:273
-msgid "Remove term"
-msgstr "Eintrag löschen"
+#: ../../include/conversation.php:738
+msgid "View in context"
+msgstr "Im Zusammenhang anschauen"
 
-#: ../../include/widgets.php:354
-msgid "Archives"
-msgstr "Archive"
+#: ../../include/conversation.php:850
+msgid "remove"
+msgstr "lösche"
 
-#: ../../include/widgets.php:467
-msgid "Refresh"
-msgstr "Aktualisieren"
+#: ../../include/conversation.php:855
+msgid "Delete Selected Items"
+msgstr "Lösche die ausgewählten Elemente"
 
-#: ../../include/widgets.php:507
-msgid "Account settings"
-msgstr "Konto-Einstellungen"
+#: ../../include/conversation.php:953
+msgid "View Source"
+msgstr "Quelle anzeigen"
 
-#: ../../include/widgets.php:513
-msgid "Channel settings"
-msgstr "Kanal-Einstellungen"
+#: ../../include/conversation.php:954
+msgid "Follow Thread"
+msgstr "Unterhaltung folgen"
 
-#: ../../include/widgets.php:522
-msgid "Additional features"
-msgstr "Zusätzliche Funktionen"
+#: ../../include/conversation.php:955
+msgid "Unfollow Thread"
+msgstr "Unterhaltung nicht mehr folgen"
 
-#: ../../include/widgets.php:529
-msgid "Feature/Addon settings"
-msgstr "Plugin-Einstellungen"
+#: ../../include/conversation.php:960
+msgid "Activity/Posts"
+msgstr "Aktivitäten/Beiträge"
 
-#: ../../include/widgets.php:535
-msgid "Display settings"
-msgstr "Anzeige-Einstellungen"
+#: ../../include/conversation.php:962
+msgid "Edit Connection"
+msgstr "Verbindung bearbeiten"
 
-#: ../../include/widgets.php:542
-msgid "Manage locations"
-msgstr "Klon-Adressen verwalten"
+#: ../../include/conversation.php:963
+msgid "Message"
+msgstr "Nachricht"
 
-#: ../../include/widgets.php:551
-msgid "Export channel"
-msgstr "Kanal exportieren"
+#: ../../include/conversation.php:1080
+#, php-format
+msgid "%s likes this."
+msgstr "%s gefällt das."
 
-#: ../../include/widgets.php:558
-msgid "Connected apps"
-msgstr "Verbundene Apps"
+#: ../../include/conversation.php:1080
+#, php-format
+msgid "%s doesn't like this."
+msgstr "%s gefällt das nicht."
 
-#: ../../include/widgets.php:573
-msgid "Premium Channel Settings"
-msgstr "Premium-Kanal-Einstellungen"
+#: ../../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 Person</span> gefällt das."
+msgstr[1] "<span  %1$s>%2$d Leuten</span> gefällt das."
 
-#: ../../include/widgets.php:602
-msgid "Private Mail Menu"
-msgstr "Private Nachrichten"
+#: ../../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 Person</span> gefällt das nicht."
+msgstr[1] "<span  %1$s>%2$d Leuten</span> gefällt das nicht."
 
-#: ../../include/widgets.php:604
-msgid "Combined View"
-msgstr "Kombinierte Anzeige"
+#: ../../include/conversation.php:1092
+msgid "and"
+msgstr "und"
 
-#: ../../include/widgets.php:609 ../../include/nav.php:199
-msgid "Inbox"
-msgstr "Eingang"
+#: ../../include/conversation.php:1095
+#, php-format
+msgid ", and %d other people"
+msgid_plural ", and %d other people"
+msgstr[0] ""
+msgstr[1] ", und %d andere"
 
-#: ../../include/widgets.php:614 ../../include/nav.php:200
-msgid "Outbox"
-msgstr "Ausgang"
+#: ../../include/conversation.php:1096
+#, php-format
+msgid "%s like this."
+msgstr "%s gefällt das."
 
-#: ../../include/widgets.php:619 ../../include/nav.php:201
-msgid "New Message"
-msgstr "Neue Nachricht"
+#: ../../include/conversation.php:1096
+#, php-format
+msgid "%s don't like this."
+msgstr "%s gefällt das nicht."
 
-#: ../../include/widgets.php:636 ../../include/widgets.php:648
-msgid "Conversations"
-msgstr "Konversationen"
+#: ../../include/conversation.php:1136
+msgid "Set your location"
+msgstr "Standort"
 
-#: ../../include/widgets.php:640
-msgid "Received Messages"
-msgstr "Erhaltene Nachrichten"
+#: ../../include/conversation.php:1137
+msgid "Clear browser location"
+msgstr "Browser-Standort löschen"
 
-#: ../../include/widgets.php:644
-msgid "Sent Messages"
-msgstr "Gesendete Nachrichten"
+#: ../../include/conversation.php:1183
+msgid "Tag term:"
+msgstr "Schlagwort:"
 
-#: ../../include/widgets.php:658
-msgid "No messages."
-msgstr "Keine Nachrichten."
+#: ../../include/conversation.php:1184
+msgid "Where are you right now?"
+msgstr "Wo bist Du jetzt grade?"
 
-#: ../../include/widgets.php:676
-msgid "Delete conversation"
-msgstr "Unterhaltung löschen"
+#: ../../include/conversation.php:1216
+msgid "Page link name"
+msgstr "Link zur Seite"
 
-#: ../../include/widgets.php:702
-msgid "Events Menu"
-msgstr "Kalendermenü"
+#: ../../include/conversation.php:1219
+msgid "Post as"
+msgstr "Veröffentlichen als"
 
-#: ../../include/widgets.php:703
-msgid "Day View"
-msgstr "Tagesansicht"
+#: ../../include/conversation.php:1229
+msgid "Toggle voting"
+msgstr "Umfragewerkzeug aktivieren"
 
-#: ../../include/widgets.php:704
-msgid "Week View"
-msgstr "Wochenansicht"
+#: ../../include/conversation.php:1237
+msgid "Categories (optional, comma-separated list)"
+msgstr "Kategorien (optional, kommagetrennte Liste)"
 
-#: ../../include/widgets.php:705
-msgid "Month View"
-msgstr "Monatsansicht"
+#: ../../include/conversation.php:1260
+msgid "Set publish date"
+msgstr "Veröffentlichungsdatum festlegen"
 
-#: ../../include/widgets.php:717
-msgid "Events Tools"
-msgstr "Kalenderwerkzeuge"
+#: ../../include/conversation.php:1264
+msgid "OK"
+msgstr "Ok"
 
-#: ../../include/widgets.php:718
-msgid "Export Calendar"
-msgstr "Kalender exportieren"
+#: ../../include/conversation.php:1509
+msgid "Discover"
+msgstr "Entdecken"
 
-#: ../../include/widgets.php:719
-msgid "Import Calendar"
-msgstr "Kalender importieren"
+#: ../../include/conversation.php:1512
+msgid "Imported public streams"
+msgstr "Importierte öffentliche Beiträge"
 
-#: ../../include/widgets.php:798
-msgid "Overview"
-msgstr "Ãœbersicht"
+#: ../../include/conversation.php:1517
+msgid "Commented Order"
+msgstr "Neueste Kommentare"
 
-#: ../../include/widgets.php:805
-msgid "Chat Members"
-msgstr "Chatmitglieder"
+#: ../../include/conversation.php:1520
+msgid "Sort by Comment Date"
+msgstr "Nach Kommentardatum sortiert"
 
-#: ../../include/widgets.php:828
-msgid "Bookmarked Chatrooms"
-msgstr "Gespeicherte Chatrooms"
+#: ../../include/conversation.php:1524
+msgid "Posted Order"
+msgstr "Neueste Beiträge"
 
-#: ../../include/widgets.php:851
-msgid "Suggested Chatrooms"
-msgstr "Chatraum-Vorschläge"
+#: ../../include/conversation.php:1527
+msgid "Sort by Post Date"
+msgstr "Nach Beitragsdatum sortiert"
 
-#: ../../include/widgets.php:996 ../../include/widgets.php:1108
-msgid "photo/image"
-msgstr "Foto/Bild"
+#: ../../include/conversation.php:1535
+msgid "Posts that mention or involve you"
+msgstr "Beiträge mit Beteiligung Deinerseits"
 
-#: ../../include/widgets.php:1051
-msgid "Click to show more"
-msgstr "Klick, um mehr anzuzeigen"
+#: ../../include/conversation.php:1544
+msgid "Activity Stream - by date"
+msgstr "Activity Stream – nach Datum sortiert"
 
-#: ../../include/widgets.php:1202
-msgid "Rating Tools"
-msgstr "Bewertungswerkzeuge"
+#: ../../include/conversation.php:1550
+msgid "Starred"
+msgstr "Markiert"
 
-#: ../../include/widgets.php:1206 ../../include/widgets.php:1208
-msgid "Rate Me"
-msgstr "Bewerte mich"
+#: ../../include/conversation.php:1553
+msgid "Favourite Posts"
+msgstr "Markierte Beiträge"
 
-#: ../../include/widgets.php:1211
-msgid "View Ratings"
-msgstr "Bewertungen ansehen"
+#: ../../include/conversation.php:1560
+msgid "Spam"
+msgstr "Spam"
 
-#: ../../include/widgets.php:1268
-msgid "Forums"
-msgstr "Foren"
+#: ../../include/conversation.php:1563
+msgid "Posts flagged as SPAM"
+msgstr "Nachrichten, die als SPAM markiert wurden"
 
-#: ../../include/widgets.php:1297
-msgid "Tasks"
-msgstr "Aufgaben"
+#: ../../include/conversation.php:1620
+msgid "Status Messages and Posts"
+msgstr "Statusnachrichten und Beiträge"
 
-#: ../../include/widgets.php:1306
-msgid "Documentation"
-msgstr "Dokumentation"
+#: ../../include/conversation.php:1629
+msgid "About"
+msgstr "Ãœber"
 
-#: ../../include/widgets.php:1308
-msgid "Project/Site Information"
-msgstr "Informationen über das Projekt und diesen Hub"
+#: ../../include/conversation.php:1632
+msgid "Profile Details"
+msgstr "Profil-Details"
 
-#: ../../include/widgets.php:1309
-msgid "For Members"
-msgstr "Für Mitglieder"
+#: ../../include/conversation.php:1648
+msgid "Files and Storage"
+msgstr "Dateien und Speicher"
 
-#: ../../include/widgets.php:1310
-msgid "For Administrators"
-msgstr "Für Administratoren"
+#: ../../include/conversation.php:1685
+msgid "Saved Bookmarks"
+msgstr "Gespeicherte Lesezeichen"
 
-#: ../../include/widgets.php:1311
-msgid "For Developers"
-msgstr "Für Entwickler"
+#: ../../include/conversation.php:1695
+msgid "Manage Webpages"
+msgstr "Webseiten verwalten"
 
-#: ../../include/widgets.php:1335
-msgid "Accounts"
-msgstr "Konten"
+#: ../../include/conversation.php:1754
+msgctxt "noun"
+msgid "Attending"
+msgid_plural "Attending"
+msgstr[0] "Zusage"
+msgstr[1] "Zusagen"
 
-#: ../../include/widgets.php:1335 ../../include/widgets.php:1373
-msgid "Member registrations waiting for confirmation"
-msgstr "Nutzer-Anmeldungen, die auf Bestätigung warten"
+#: ../../include/conversation.php:1757
+msgctxt "noun"
+msgid "Not Attending"
+msgid_plural "Not Attending"
+msgstr[0] "Absage"
+msgstr[1] "Absagen"
 
-#: ../../include/widgets.php:1341
-msgid "Inspect queue"
-msgstr "Warteschlange kontrollieren"
+#: ../../include/conversation.php:1760
+msgctxt "noun"
+msgid "Undecided"
+msgid_plural "Undecided"
+msgstr[0] " Unentschlossen"
+msgstr[1] "Unentschlossene"
 
-#: ../../include/widgets.php:1343
-msgid "DB updates"
-msgstr "DB-Aktualisierungen"
+#: ../../include/conversation.php:1763
+msgctxt "noun"
+msgid "Agree"
+msgid_plural "Agrees"
+msgstr[0] "Zustimmung"
+msgstr[1] "Zustimmungen"
 
-#: ../../include/widgets.php:1368 ../../include/nav.php:219
-msgid "Admin"
-msgstr "Administration"
+#: ../../include/conversation.php:1766
+msgctxt "noun"
+msgid "Disagree"
+msgid_plural "Disagrees"
+msgstr[0] "Ablehnung"
+msgstr[1] "Ablehnungen"
 
-#: ../../include/widgets.php:1369
-msgid "Plugin Features"
-msgstr "Plug-In Funktionen"
+#: ../../include/conversation.php:1769
+msgctxt "noun"
+msgid "Abstain"
+msgid_plural "Abstains"
+msgstr[0] "Enthaltung"
+msgstr[1] "Enthaltungen"
 
-#: ../../include/taxonomy.php:240 ../../include/taxonomy.php:261
+#: ../../include/text.php:423
+msgid "prev"
+msgstr "vorherige"
+
+#: ../../include/text.php:425
+msgid "first"
+msgstr "erste"
+
+#: ../../include/text.php:454
+msgid "last"
+msgstr "letzte"
+
+#: ../../include/text.php:457
+msgid "next"
+msgstr "nächste"
+
+#: ../../include/text.php:467
+msgid "older"
+msgstr "älter"
+
+#: ../../include/text.php:469
+msgid "newer"
+msgstr "neuer"
+
+#: ../../include/text.php:851
+msgid "No connections"
+msgstr "Keine Verbindungen"
+
+#: ../../include/text.php:876
+#, php-format
+msgid "View all %s connections"
+msgstr "Alle Verbindungen von %s anzeigen"
+
+#: ../../include/text.php:1021 ../../include/text.php:1026
+msgid "poke"
+msgstr "anstupsen"
+
+#: ../../include/text.php:1027
+msgid "ping"
+msgstr "anpingen"
+
+#: ../../include/text.php:1027
+msgid "pinged"
+msgstr "pingte"
+
+#: ../../include/text.php:1028
+msgid "prod"
+msgstr "knuffen"
+
+#: ../../include/text.php:1028
+msgid "prodded"
+msgstr "knuffte"
+
+#: ../../include/text.php:1029
+msgid "slap"
+msgstr "ohrfeigen"
+
+#: ../../include/text.php:1029
+msgid "slapped"
+msgstr "ohrfeigte"
+
+#: ../../include/text.php:1030
+msgid "finger"
+msgstr "befummeln"
+
+#: ../../include/text.php:1030
+msgid "fingered"
+msgstr "befummelte"
+
+#: ../../include/text.php:1031
+msgid "rebuff"
+msgstr "eine Abfuhr erteilen"
+
+#: ../../include/text.php:1031
+msgid "rebuffed"
+msgstr "zurückgewiesen"
+
+#: ../../include/text.php:1043
+msgid "happy"
+msgstr "glücklich"
+
+#: ../../include/text.php:1044
+msgid "sad"
+msgstr "traurig"
+
+#: ../../include/text.php:1045
+msgid "mellow"
+msgstr "sanft"
+
+#: ../../include/text.php:1046
+msgid "tired"
+msgstr "müde"
+
+#: ../../include/text.php:1047
+msgid "perky"
+msgstr "frech"
+
+#: ../../include/text.php:1048
+msgid "angry"
+msgstr "sauer"
+
+#: ../../include/text.php:1049
+msgid "stupefied"
+msgstr "verblüfft"
+
+#: ../../include/text.php:1050
+msgid "puzzled"
+msgstr "verwirrt"
+
+#: ../../include/text.php:1051
+msgid "interested"
+msgstr "interessiert"
+
+#: ../../include/text.php:1052
+msgid "bitter"
+msgstr "verbittert"
+
+#: ../../include/text.php:1053
+msgid "cheerful"
+msgstr "fröhlich"
+
+#: ../../include/text.php:1054
+msgid "alive"
+msgstr "lebendig"
+
+#: ../../include/text.php:1055
+msgid "annoyed"
+msgstr "verärgert"
+
+#: ../../include/text.php:1056
+msgid "anxious"
+msgstr "unruhig"
+
+#: ../../include/text.php:1057
+msgid "cranky"
+msgstr "schrullig"
+
+#: ../../include/text.php:1058
+msgid "disturbed"
+msgstr "verstört"
+
+#: ../../include/text.php:1059
+msgid "frustrated"
+msgstr "frustriert"
+
+#: ../../include/text.php:1060
+msgid "depressed"
+msgstr "deprimiert"
+
+#: ../../include/text.php:1061
+msgid "motivated"
+msgstr "motiviert"
+
+#: ../../include/text.php:1062
+msgid "relaxed"
+msgstr "entspannt"
+
+#: ../../include/text.php:1063
+msgid "surprised"
+msgstr "überrascht"
+
+#: ../../include/text.php:1235 ../../include/js_strings.php:70
+msgid "Monday"
+msgstr "Montag"
+
+#: ../../include/text.php:1235 ../../include/js_strings.php:71
+msgid "Tuesday"
+msgstr "Dienstag"
+
+#: ../../include/text.php:1235 ../../include/js_strings.php:72
+msgid "Wednesday"
+msgstr "Mittwoch"
+
+#: ../../include/text.php:1235 ../../include/js_strings.php:73
+msgid "Thursday"
+msgstr "Donnerstag"
+
+#: ../../include/text.php:1235 ../../include/js_strings.php:74
+msgid "Friday"
+msgstr "Freitag"
+
+#: ../../include/text.php:1235 ../../include/js_strings.php:75
+msgid "Saturday"
+msgstr "Samstag"
+
+#: ../../include/text.php:1235 ../../include/js_strings.php:69
+msgid "Sunday"
+msgstr "Sonntag"
+
+#: ../../include/text.php:1239 ../../include/js_strings.php:45
+msgid "January"
+msgstr "Januar"
+
+#: ../../include/text.php:1239 ../../include/js_strings.php:46
+msgid "February"
+msgstr "Februar"
+
+#: ../../include/text.php:1239 ../../include/js_strings.php:47
+msgid "March"
+msgstr "März"
+
+#: ../../include/text.php:1239 ../../include/js_strings.php:48
+msgid "April"
+msgstr "April"
+
+#: ../../include/text.php:1239
+msgid "May"
+msgstr "Mai"
+
+#: ../../include/text.php:1239 ../../include/js_strings.php:50
+msgid "June"
+msgstr "Juni"
+
+#: ../../include/text.php:1239 ../../include/js_strings.php:51
+msgid "July"
+msgstr "Juli"
+
+#: ../../include/text.php:1239 ../../include/js_strings.php:52
+msgid "August"
+msgstr "August"
+
+#: ../../include/text.php:1239 ../../include/js_strings.php:53
+msgid "September"
+msgstr "September"
+
+#: ../../include/text.php:1239 ../../include/js_strings.php:54
+msgid "October"
+msgstr "Oktober"
+
+#: ../../include/text.php:1239 ../../include/js_strings.php:55
+msgid "November"
+msgstr "November"
+
+#: ../../include/text.php:1239 ../../include/js_strings.php:56
+msgid "December"
+msgstr "Dezember"
+
+#: ../../include/text.php:1316 ../../include/text.php:1320
+msgid "Unknown Attachment"
+msgstr "Unbekannter Anhang"
+
+#: ../../include/text.php:1322
+msgid "unknown"
+msgstr "unbekannt"
+
+#: ../../include/text.php:1358
+msgid "remove category"
+msgstr "Kategorie entfernen"
+
+#: ../../include/text.php:1435
+msgid "remove from file"
+msgstr "aus der Datei entfernen"
+
+#: ../../include/text.php:1764 ../../include/text.php:1836
+msgid "default"
+msgstr "Standard"
+
+#: ../../include/text.php:1772
+msgid "Page layout"
+msgstr "Seiten-Layout"
+
+#: ../../include/text.php:1772
+msgid "You can create your own with the layouts tool"
+msgstr "Mit dem Gestaltungswerkzeug kannst Du Deine eigenen Layouts erstellen"
+
+#: ../../include/text.php:1814
+msgid "Page content type"
+msgstr "Art des Seiteninhalts"
+
+#: ../../include/text.php:1848
+msgid "Select an alternate language"
+msgstr "Wähle eine alternative Sprache"
+
+#: ../../include/text.php:1965
+msgid "activity"
+msgstr "Aktivität"
+
+#: ../../include/text.php:2274
+msgid "Design Tools"
+msgstr "Gestaltungswerkzeuge"
+
+#: ../../include/text.php:2280
+msgid "Pages"
+msgstr "Seiten"
+
+#: ../../include/account.php:28
+msgid "Not a valid email address"
+msgstr "Ungültige E-Mail-Adresse"
+
+#: ../../include/account.php:30
+msgid "Your email domain is not among those allowed on this site"
+msgstr "Deine E-Mail-Adresse ist auf dieser Seite nicht erlaubt"
+
+#: ../../include/account.php:36
+msgid "Your email address is already registered at this site."
+msgstr "Deine E-Mail-Adresse ist auf dieser Seite bereits registriert."
+
+#: ../../include/account.php:68
+msgid "An invitation is required."
+msgstr "Eine Einladung wird benötigt."
+
+#: ../../include/account.php:72
+msgid "Invitation could not be verified."
+msgstr "Die Einladung konnte nicht bestätigt werden."
+
+#: ../../include/account.php:122
+msgid "Please enter the required information."
+msgstr "Bitte gib die benötigten Informationen ein."
+
+#: ../../include/account.php:189
+msgid "Failed to store account information."
+msgstr "Speichern der Nutzerkontodaten fehlgeschlagen."
+
+#: ../../include/account.php:249
+#, php-format
+msgid "Registration confirmation for %s"
+msgstr "Registrierungsbestätigung für %s"
+
+#: ../../include/account.php:315
+#, php-format
+msgid "Registration request at %s"
+msgstr "Registrierungsanfrage auf %s"
+
+#: ../../include/account.php:339
+msgid "your registration password"
+msgstr "Dein Registrierungspasswort"
+
+#: ../../include/account.php:342 ../../include/account.php:402
+#, php-format
+msgid "Registration details for %s"
+msgstr "Registrierungsdetails für %s"
+
+#: ../../include/account.php:414
+msgid "Account approved."
+msgstr "Nutzerkonto bestätigt."
+
+#: ../../include/account.php:454
+#, php-format
+msgid "Registration revoked for %s"
+msgstr "Registrierung für %s wurde widerrufen"
+
+#: ../../include/account.php:506
+msgid "Account verified. Please login."
+msgstr "Nutzerkonto wurde bestätigt. Bitte melde Dich an!"
+
+#: ../../include/account.php:722 ../../include/account.php:724
+msgid "Click here to upgrade."
+msgstr "Klicke hier, um das Upgrade durchzuführen."
+
+#: ../../include/account.php:730
+msgid "This action exceeds the limits set by your subscription plan."
+msgstr "Diese Aktion überschreitet die Grenzen Ihres Abonnements."
+
+#: ../../include/account.php:735
+msgid "This action is not available under your subscription plan."
+msgstr "Diese Aktion ist in Ihrem Abonnement nicht verfügbar."
+
+#: ../../include/taxonomy.php:228 ../../include/taxonomy.php:249
 msgid "Tags"
 msgstr "Schlagwörter"
 
-#: ../../include/taxonomy.php:305
+#: ../../include/taxonomy.php:293
 msgid "Keywords"
 msgstr "Schlüsselwörter"
 
-#: ../../include/taxonomy.php:326
+#: ../../include/taxonomy.php:314
 msgid "have"
 msgstr "habe"
 
-#: ../../include/taxonomy.php:326
+#: ../../include/taxonomy.php:314
 msgid "has"
 msgstr "hat"
 
-#: ../../include/taxonomy.php:327
+#: ../../include/taxonomy.php:315
 msgid "want"
 msgstr "will"
 
-#: ../../include/taxonomy.php:327
+#: ../../include/taxonomy.php:315
 msgid "wants"
 msgstr "will"
 
-#: ../../include/taxonomy.php:328
+#: ../../include/taxonomy.php:316
 msgid "likes"
 msgstr "gefällt"
 
-#: ../../include/taxonomy.php:329
+#: ../../include/taxonomy.php:317
 msgid "dislikes"
 msgstr "missfällt"
 
+#: ../../include/PermissionDescription.php:115
+msgid "Only me"
+msgstr "Nur ich"
+
+#: ../../include/PermissionDescription.php:116
+msgid "Public"
+msgstr "Öffentlich"
+
+#: ../../include/PermissionDescription.php:117
+msgid "Anybody in the $Projectname network"
+msgstr "Jeder innerhalb des $Projectname Netzwerks"
+
+#: ../../include/PermissionDescription.php:118
+#, php-format
+msgid "Any account on %s"
+msgstr "Jedes Nutzerkonto auf %s"
+
+#: ../../include/PermissionDescription.php:119
+msgid "Any of my connections"
+msgstr "Alle meine Verbindungen"
+
+#: ../../include/PermissionDescription.php:124
+msgid "Only me (only specified contacts and me)"
+msgstr "Nur ich (nur ausgewählte Kontakte und ich)"
+
+#: ../../include/PermissionDescription.php:125
+msgid "Anybody authenticated (could include visitors from other networks)"
+msgstr "Jeder, der angemeldet ist (kann Besucher anderer Netzwerke beinhalten)"
+
+#: ../../include/PermissionDescription.php:126
+msgid "Any connections including those who haven't yet been approved"
+msgstr "Alle Verbindungen einschließlich der noch nicht bestätigten"
+
+#: ../../include/PermissionDescription.php:169
+msgid ""
+"This is your default setting for the audience of your normal stream, and "
+"posts."
+msgstr "Dies ist Deine Voreinstellung für die Sichtbarkeit Deiner normalen Beiträge (Stream)."
+
+#: ../../include/PermissionDescription.php:170
+msgid ""
+"This is your default setting for who can view your default channel profile"
+msgstr "Dies ist Deine Voreinstellung für die Sichtbarkeit Deines Standard-Kanalprofils."
+
+#: ../../include/PermissionDescription.php:171
+msgid "This is your default setting for who can view your connections"
+msgstr "Dies ist Deine Voreinstellung für die Sichtbarkeit Deiner Verbindungen."
+
+#: ../../include/PermissionDescription.php:172
+msgid ""
+"This is your default setting for who can view your file storage and photos"
+msgstr "Dies ist Deine Voreinstellung für die Sichtbarkeit Deiner Dateien und Fotos."
+
+#: ../../include/PermissionDescription.php:173
+msgid "This is your default setting for the audience of your webpages"
+msgstr "Dies ist Deine Voreinstellung für die Sichtbarkeit Deiner Webseiten."
+
 #: ../../include/js_strings.php:5
 msgid "Delete this item?"
 msgstr "Dieses Element löschen?"
@@ -8782,6 +9221,10 @@ msgstr "Kennwort zu kurz"
 msgid "Passwords do not match"
 msgstr "Kennwörter stimmen nicht überein"
 
+#: ../../include/js_strings.php:13
+msgid "everybody"
+msgstr "alle"
+
 #: ../../include/js_strings.php:14
 msgid "Secret Passphrase"
 msgstr "geheime Passphrase"
@@ -8891,55 +9334,11 @@ msgstr " "
 msgid "timeago.numbers"
 msgstr "timeago.numbers"
 
-#: ../../include/js_strings.php:45 ../../include/text.php:1210
-msgid "January"
-msgstr "Januar"
-
-#: ../../include/js_strings.php:46 ../../include/text.php:1210
-msgid "February"
-msgstr "Februar"
-
-#: ../../include/js_strings.php:47 ../../include/text.php:1210
-msgid "March"
-msgstr "März"
-
-#: ../../include/js_strings.php:48 ../../include/text.php:1210
-msgid "April"
-msgstr "April"
-
 #: ../../include/js_strings.php:49
 msgctxt "long"
 msgid "May"
 msgstr "Mai"
 
-#: ../../include/js_strings.php:50 ../../include/text.php:1210
-msgid "June"
-msgstr "Juni"
-
-#: ../../include/js_strings.php:51 ../../include/text.php:1210
-msgid "July"
-msgstr "Juli"
-
-#: ../../include/js_strings.php:52 ../../include/text.php:1210
-msgid "August"
-msgstr "August"
-
-#: ../../include/js_strings.php:53 ../../include/text.php:1210
-msgid "September"
-msgstr "September"
-
-#: ../../include/js_strings.php:54 ../../include/text.php:1210
-msgid "October"
-msgstr "Oktober"
-
-#: ../../include/js_strings.php:55 ../../include/text.php:1210
-msgid "November"
-msgstr "November"
-
-#: ../../include/js_strings.php:56 ../../include/text.php:1210
-msgid "December"
-msgstr "Dezember"
-
 #: ../../include/js_strings.php:57
 msgid "Jan"
 msgstr "Jan"
@@ -8989,34 +9388,6 @@ msgstr "Nov"
 msgid "Dec"
 msgstr "Dez"
 
-#: ../../include/js_strings.php:69 ../../include/text.php:1206
-msgid "Sunday"
-msgstr "Sonntag"
-
-#: ../../include/js_strings.php:70 ../../include/text.php:1206
-msgid "Monday"
-msgstr "Montag"
-
-#: ../../include/js_strings.php:71 ../../include/text.php:1206
-msgid "Tuesday"
-msgstr "Dienstag"
-
-#: ../../include/js_strings.php:72 ../../include/text.php:1206
-msgid "Wednesday"
-msgstr "Mittwoch"
-
-#: ../../include/js_strings.php:73 ../../include/text.php:1206
-msgid "Thursday"
-msgstr "Donnerstag"
-
-#: ../../include/js_strings.php:74 ../../include/text.php:1206
-msgid "Friday"
-msgstr "Freitag"
-
-#: ../../include/js_strings.php:75 ../../include/text.php:1206
-msgid "Saturday"
-msgstr "Samstag"
-
 #: ../../include/js_strings.php:76
 msgid "Sun"
 msgstr "So"
@@ -9086,22 +9457,9 @@ msgstr "Kann Absender nicht bestimmen."
 msgid "Stored post could not be verified."
 msgstr "Gespeicherter Beitrag konnten nicht überprüft werden."
 
-#: ../../include/import.php:23
-msgid ""
-"Cannot create a duplicate channel identifier on this system. Import failed."
-msgstr "Kann keinen doppelten Kanal-Identifikator auf diesem System erzeugen (Spitzname oder Hash schon belegt). Import fehlgeschlagen."
-
-#: ../../include/import.php:70
-msgid "Channel clone failed. Import failed."
-msgstr "Klonen des Kanals fehlgeschlagen. Import fehlgeschlagen."
-
-#: ../../include/oembed.php:267
-msgid "Embedded content"
-msgstr "Eingebetteter Inhalt"
-
-#: ../../include/oembed.php:276
-msgid "Embedding disabled"
-msgstr "Einbetten ausgeschaltet"
+#: ../../include/api.php:1338
+msgid "Public Timeline"
+msgstr "Öffentliche Zeitleiste"
 
 #: ../../include/page_widgets.php:6
 msgid "New Page"
@@ -9252,400 +9610,61 @@ msgstr "Speziell - Gruppenarchiv"
 msgid "Custom/Expert Mode"
 msgstr "Benutzerdefiniert/Expertenmodus"
 
-#: ../../include/text.php:394
-msgid "prev"
-msgstr "vorherige"
+#: ../../include/apps.php:155
+msgid "Site Admin"
+msgstr "Hub-Administration"
 
-#: ../../include/text.php:396
-msgid "first"
-msgstr "erste"
+#: ../../include/apps.php:156
+msgid "Bug Report"
+msgstr "Fehler-Rückmeldung"
 
-#: ../../include/text.php:425
-msgid "last"
-msgstr "letzte"
+#: ../../include/apps.php:157
+msgid "View Bookmarks"
+msgstr "Lesezeichen ansehen"
 
-#: ../../include/text.php:428
-msgid "next"
-msgstr "nächste"
+#: ../../include/apps.php:158
+msgid "My Chatrooms"
+msgstr "Meine Chaträume"
 
-#: ../../include/text.php:438
-msgid "older"
-msgstr "älter"
+#: ../../include/apps.php:160
+msgid "Firefox Share"
+msgstr "Teilen-Knopf für Firefox"
 
-#: ../../include/text.php:440
-msgid "newer"
-msgstr "neuer"
+#: ../../include/apps.php:161
+msgid "Remote Diagnostics"
+msgstr "Ferndiagnose"
 
-#: ../../include/text.php:822
-msgid "No connections"
-msgstr "Keine Verbindungen"
+#: ../../include/apps.php:180
+msgid "Probe"
+msgstr "Testen"
 
-#: ../../include/text.php:847
-#, php-format
-msgid "View all %s connections"
-msgstr "Alle Verbindungen von %s anzeigen"
+#: ../../include/apps.php:181
+msgid "Suggest"
+msgstr "Empfehlen"
 
-#: ../../include/text.php:992 ../../include/text.php:997
-msgid "poke"
-msgstr "anstupsen"
+#: ../../include/apps.php:182
+msgid "Random Channel"
+msgstr "Zufälliger Kanal"
 
-#: ../../include/text.php:998
-msgid "ping"
-msgstr "anpingen"
+#: ../../include/apps.php:183
+msgid "Invite"
+msgstr "Einladen"
 
-#: ../../include/text.php:998
-msgid "pinged"
-msgstr "pingte"
+#: ../../include/apps.php:186
+msgid "Post"
+msgstr "Beitrag schreiben"
 
-#: ../../include/text.php:999
-msgid "prod"
-msgstr "knuffen"
+#: ../../include/apps.php:289
+msgid "Purchase"
+msgstr "Kaufen"
 
-#: ../../include/text.php:999
-msgid "prodded"
-msgstr "knuffte"
+#: ../../include/bb2diaspora.php:398
+msgid "Attachments:"
+msgstr "Anhänge:"
 
-#: ../../include/text.php:1000
-msgid "slap"
-msgstr "ohrfeigen"
-
-#: ../../include/text.php:1000
-msgid "slapped"
-msgstr "ohrfeigte"
-
-#: ../../include/text.php:1001
-msgid "finger"
-msgstr "befummeln"
-
-#: ../../include/text.php:1001
-msgid "fingered"
-msgstr "befummelte"
-
-#: ../../include/text.php:1002
-msgid "rebuff"
-msgstr "eine Abfuhr erteilen"
-
-#: ../../include/text.php:1002
-msgid "rebuffed"
-msgstr "zurückgewiesen"
-
-#: ../../include/text.php:1014
-msgid "happy"
-msgstr "glücklich"
-
-#: ../../include/text.php:1015
-msgid "sad"
-msgstr "traurig"
-
-#: ../../include/text.php:1016
-msgid "mellow"
-msgstr "sanft"
-
-#: ../../include/text.php:1017
-msgid "tired"
-msgstr "müde"
-
-#: ../../include/text.php:1018
-msgid "perky"
-msgstr "frech"
-
-#: ../../include/text.php:1019
-msgid "angry"
-msgstr "sauer"
-
-#: ../../include/text.php:1020
-msgid "stupefied"
-msgstr "verblüfft"
-
-#: ../../include/text.php:1021
-msgid "puzzled"
-msgstr "verwirrt"
-
-#: ../../include/text.php:1022
-msgid "interested"
-msgstr "interessiert"
-
-#: ../../include/text.php:1023
-msgid "bitter"
-msgstr "verbittert"
-
-#: ../../include/text.php:1024
-msgid "cheerful"
-msgstr "fröhlich"
-
-#: ../../include/text.php:1025
-msgid "alive"
-msgstr "lebendig"
-
-#: ../../include/text.php:1026
-msgid "annoyed"
-msgstr "verärgert"
-
-#: ../../include/text.php:1027
-msgid "anxious"
-msgstr "unruhig"
-
-#: ../../include/text.php:1028
-msgid "cranky"
-msgstr "schrullig"
-
-#: ../../include/text.php:1029
-msgid "disturbed"
-msgstr "verstört"
-
-#: ../../include/text.php:1030
-msgid "frustrated"
-msgstr "frustriert"
-
-#: ../../include/text.php:1031
-msgid "depressed"
-msgstr "deprimiert"
-
-#: ../../include/text.php:1032
-msgid "motivated"
-msgstr "motiviert"
-
-#: ../../include/text.php:1033
-msgid "relaxed"
-msgstr "entspannt"
-
-#: ../../include/text.php:1034
-msgid "surprised"
-msgstr "überrascht"
-
-#: ../../include/text.php:1210
-msgid "May"
-msgstr "Mai"
-
-#: ../../include/text.php:1287 ../../include/text.php:1291
-msgid "Unknown Attachment"
-msgstr "Unbekannter Anhang"
-
-#: ../../include/text.php:1293
-msgid "unknown"
-msgstr "unbekannt"
-
-#: ../../include/text.php:1329
-msgid "remove category"
-msgstr "Kategorie entfernen"
-
-#: ../../include/text.php:1406
-msgid "remove from file"
-msgstr "aus der Datei entfernen"
-
-#: ../../include/text.php:1548 ../../include/text.php:1559
-msgid "Click to open/close"
-msgstr "Klicke zum Öffnen/Schließen"
-
-#: ../../include/text.php:1764 ../../include/text.php:1836
-msgid "default"
-msgstr "Standard"
-
-#: ../../include/text.php:1772
-msgid "Page layout"
-msgstr "Seiten-Layout"
-
-#: ../../include/text.php:1772
-msgid "You can create your own with the layouts tool"
-msgstr "Mit dem Gestaltungswerkzeug kannst Du Deine eigenen Layouts erstellen"
-
-#: ../../include/text.php:1814
-msgid "Page content type"
-msgstr "Art des Seiteninhalts"
-
-#: ../../include/text.php:1848
-msgid "Select an alternate language"
-msgstr "Wähle eine alternative Sprache"
-
-#: ../../include/text.php:1980
-msgid "activity"
-msgstr "Aktivität"
-
-#: ../../include/text.php:2275
-msgid "Design Tools"
-msgstr "Gestaltungswerkzeuge"
-
-#: ../../include/text.php:2281
-msgid "Pages"
-msgstr "Seiten"
-
-#: ../../include/nav.php:82 ../../include/nav.php:113 ../../boot.php:1601
-msgid "Logout"
-msgstr "Abmelden"
-
-#: ../../include/nav.php:82 ../../include/nav.php:113
-msgid "End this session"
-msgstr "Beende diese Sitzung"
-
-#: ../../include/nav.php:85 ../../include/nav.php:144
-msgid "Home"
-msgstr "Home"
-
-#: ../../include/nav.php:85
-msgid "Your posts and conversations"
-msgstr "Deine Beiträge und Unterhaltungen"
-
-#: ../../include/nav.php:86
-msgid "Your profile page"
-msgstr "Deine Profilseite"
-
-#: ../../include/nav.php:88
-msgid "Manage/Edit profiles"
-msgstr "Profile verwalten"
-
-#: ../../include/nav.php:90
-msgid "Edit your profile"
-msgstr "Profil bearbeiten"
-
-#: ../../include/nav.php:92
-msgid "Your photos"
-msgstr "Deine Bilder"
-
-#: ../../include/nav.php:93
-msgid "Your files"
-msgstr "Deine Dateien"
-
-#: ../../include/nav.php:96
-msgid "Your chatrooms"
-msgstr "Deine Chaträume"
-
-#: ../../include/nav.php:102
-msgid "Your bookmarks"
-msgstr "Deine Lesezeichen"
-
-#: ../../include/nav.php:106
-msgid "Your webpages"
-msgstr "Deine Webseiten"
-
-#: ../../include/nav.php:110
-msgid "Sign in"
-msgstr "Anmelden"
-
-#: ../../include/nav.php:127
-#, php-format
-msgid "%s - click to logout"
-msgstr "%s - Klick zum Abmelden"
-
-#: ../../include/nav.php:130
-msgid "Remote authentication"
-msgstr "Ãœber Konto auf anderem Server einloggen"
-
-#: ../../include/nav.php:130
-msgid "Click to authenticate to your home hub"
-msgstr "Klicke, um Dich über Deinen Heimat-Server zu authentifizieren"
-
-#: ../../include/nav.php:144
-msgid "Home Page"
-msgstr "Homepage"
-
-#: ../../include/nav.php:148
-msgid "Create an account"
-msgstr "Erzeuge ein Konto"
-
-#: ../../include/nav.php:161
-msgid "Help and documentation"
-msgstr "Hilfe und Dokumentation"
-
-#: ../../include/nav.php:165
-msgid "Applications, utilities, links, games"
-msgstr "Anwendungen (Apps), Zubehör, Links, Spiele"
-
-#: ../../include/nav.php:167
-msgid "Search site @name, #tag, ?docs, content"
-msgstr "Hub durchsuchen: @Name. #Schlagwort, ?Dokumentation, Inhalt"
-
-#: ../../include/nav.php:170
-msgid "Channel Directory"
-msgstr "Kanal-Verzeichnis"
-
-#: ../../include/nav.php:182
-msgid "Your grid"
-msgstr "Dein Grid"
-
-#: ../../include/nav.php:183
-msgid "Mark all grid notifications seen"
-msgstr "Alle Grid-Benachrichtigungen als angesehen markieren"
-
-#: ../../include/nav.php:185
-msgid "Channel home"
-msgstr "Mein Kanal"
-
-#: ../../include/nav.php:186
-msgid "Mark all channel notifications seen"
-msgstr "Markiere alle Kanal-Benachrichtigungen als angesehen"
-
-#: ../../include/nav.php:192
-msgid "Notices"
-msgstr "Benachrichtigungen"
-
-#: ../../include/nav.php:192
-msgid "Notifications"
-msgstr "Benachrichtigungen"
-
-#: ../../include/nav.php:193
-msgid "See all notifications"
-msgstr "Alle Benachrichtigungen ansehen"
-
-#: ../../include/nav.php:196
-msgid "Private mail"
-msgstr "Persönliche Mail"
-
-#: ../../include/nav.php:197
-msgid "See all private messages"
-msgstr "Alle persönlichen Nachrichten ansehen"
-
-#: ../../include/nav.php:198
-msgid "Mark all private messages seen"
-msgstr "Markiere alle persönlichen Nachrichten als gesehen"
-
-#: ../../include/nav.php:204
-msgid "Event Calendar"
-msgstr "Terminkalender"
-
-#: ../../include/nav.php:205
-msgid "See all events"
-msgstr "Alle Termine ansehen"
-
-#: ../../include/nav.php:206
-msgid "Mark all events seen"
-msgstr "Markiere alle Termine als gesehen"
-
-#: ../../include/nav.php:209
-msgid "Manage Your Channels"
-msgstr "Verwalte Deine Kanäle"
-
-#: ../../include/nav.php:211
-msgid "Account/Channel Settings"
-msgstr "Konto-/Kanal-Einstellungen"
-
-#: ../../include/nav.php:219
-msgid "Site Setup and Configuration"
-msgstr "Seiten-Einrichtung und -Konfiguration"
-
-#: ../../include/nav.php:261
-msgid "@name, #tag, ?doc, content"
-msgstr "@Name, #Schlagwort, ?Dokumentation, Inhalt"
-
-#: ../../include/nav.php:262
-msgid "Please wait..."
-msgstr "Bitte warten..."
-
-#: ../../include/zot.php:680
-msgid "Invalid data packet"
-msgstr "Ungültiges Datenpaket"
-
-#: ../../include/zot.php:696
-msgid "Unable to verify channel signature"
-msgstr "Konnte die Signatur des Kanals nicht verifizieren"
-
-#: ../../include/zot.php:2332
-#, php-format
-msgid "Unable to verify site signature for %s"
-msgstr "Kann die Signatur der Seite von %s nicht verifizieren"
-
-#: ../../include/zot.php:3670
-msgid "invalid target signature"
-msgstr "Ungültige Signatur des Ziels"
+#: ../../include/bb2diaspora.php:489
+msgid "$Projectname event notification:"
+msgstr "$Projectname-Terminbenachrichtigung:"
 
 #: ../../view/theme/redbasic/php/config.php:82
 msgid "Focus (Hubzilla default)"
@@ -9804,41 +9823,41 @@ msgstr "Aktualisierung %s fehlgeschlagen. Details in den Fehlerprotokollen."
 msgid "Update Error at %s"
 msgstr "Aktualisierungsfehler auf %s"
 
-#: ../../boot.php:1583
+#: ../../boot.php:1596
 msgid ""
 "Create an account to access services and applications within the Hubzilla"
 msgstr "Erstelle ein Konto, um Anwendungen und Dienste innerhalb von Hubzilla nutzen zu können."
 
-#: ../../boot.php:1605
+#: ../../boot.php:1618
 msgid "Password"
 msgstr "Kennwort"
 
-#: ../../boot.php:1606
+#: ../../boot.php:1619
 msgid "Remember me"
 msgstr "Angaben speichern"
 
-#: ../../boot.php:1609
+#: ../../boot.php:1622
 msgid "Forgot your password?"
 msgstr "Passwort vergessen?"
 
-#: ../../boot.php:2238
+#: ../../boot.php:2269
 msgid "toggle mobile"
 msgstr "auf/von mobile Ansicht wechseln"
 
-#: ../../boot.php:2391
+#: ../../boot.php:2422
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr "Das SSL-Zertifikat der Website ist nicht gültig. Bitte beheben."
 
-#: ../../boot.php:2394
+#: ../../boot.php:2425
 #, php-format
 msgid "[hubzilla] Website SSL error for %s"
 msgstr "[hubzilla] Website-SSL-Fehler für %s"
 
-#: ../../boot.php:2431
+#: ../../boot.php:2462
 msgid "Cron/Scheduled tasks not running."
 msgstr "Cron-Aufgaben laufen nicht."
 
-#: ../../boot.php:2435
+#: ../../boot.php:2466
 #, php-format
 msgid "[hubzilla] Cron tasks not running on %s"
 msgstr "[hubzilla] Cron-Aufgaben für %s laufen nicht"
diff --git a/view/de/hstrings.php b/view/de/hstrings.php
index 30355e37a..2c7ba67d4 100644
--- a/view/de/hstrings.php
+++ b/view/de/hstrings.php
@@ -48,6 +48,7 @@ App::$strings["# Channels"] = "Anzahl der Kanäle";
 App::$strings["# primary"] = "Anzahl der primären Kanäle";
 App::$strings["# clones"] = "Anzahl der Klone";
 App::$strings["Message queues"] = "Nachrichten-Warteschlangen";
+App::$strings["Your software should be updated"] = "Die installierte Software sollte aktualisiert werden";
 App::$strings["Administration"] = "Administration";
 App::$strings["Summary"] = "Zusammenfassung";
 App::$strings["Registered accounts"] = "Registrierte Konten";
@@ -55,6 +56,8 @@ App::$strings["Pending registrations"] = "Ausstehende Registrierungen";
 App::$strings["Registered channels"] = "Registrierte Kanäle";
 App::$strings["Active plugins"] = "Aktive Plug-Ins";
 App::$strings["Version"] = "Version";
+App::$strings["Repository version (master)"] = "Repository-Version (master)";
+App::$strings["Repository version (dev)"] = "Repository-Version (dev)";
 App::$strings["Site settings updated."] = "Site-Einstellungen aktualisiert.";
 App::$strings["Default"] = "Standard";
 App::$strings["mobile"] = "mobil";
@@ -140,20 +143,25 @@ App::$strings["for channel"] = "für Kanal";
 App::$strings["on server"] = "auf Server";
 App::$strings["Status"] = "Status";
 App::$strings["Server"] = "Server";
+App::$strings["By default, unfiltered HTML is allowed in embedded media. This is inherently insecure."] = "Standardmäßig wird ungefiltertes HTML in eingebetteten Inhalten zugelassen. Das ist prinzipiell unsicher.";
+App::$strings["The recommended setting is to only allow unfiltered HTML from the following sites:"] = "Die empfohlene Einstellung ist, ungefiltertes HTML nur von den nachfolgenden Webseiten zu erlauben:";
+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."] = "Alle anderen eingebetteten Inhalte werden gefiltert, <strong>es sei denn</strong>, eingebettete Inhalte von einer bestimmten Seite sind explizit blockiert.";
 App::$strings["Security"] = "Sicherheit";
 App::$strings["Block public"] = "Öffentlichen Zugriff blockieren";
 App::$strings["Check to block public access to all otherwise public personal pages on this site unless you are currently authenticated."] = "Blockiere den öffentlichen Zugriff auf alle ansonsten öffentlichen persönlichen Seiten dieser Website, sofern ein Besucher nicht angemeldet ist.";
+App::$strings["Set \"Transport Security\" HTTP header"] = "Setze den \"Transport Security\" HTTP Header";
+App::$strings["Set \"Content Security Policy\" HTTP header"] = "Setze den \"Content Security Policy\" HTTP Header";
 App::$strings["Allow communications only from these sites"] = "Kommunikation nur von diesen Seiten erlauben";
 App::$strings["One site per line. Leave empty to allow communication from anywhere by default"] = "Ein Eintrag pro Zeile. Lasse das Feld leer, um Kommunikation grundlegend von überall her zu erlauben.";
 App::$strings["Block communications from these sites"] = "Kommunikation von diesen Seiten blockieren";
 App::$strings["Allow communications only from these channels"] = "Kommunikation nur von diesen Kanälen erlauben";
 App::$strings["One channel (hash) per line. Leave empty to allow from any channel by default"] = "Ein Kanal (hash) pro Zeile. Leerlassen um jeden Kanal zuzulassen. ";
 App::$strings["Block communications from these channels"] = "Kommunikation von folgenden Kanälen blockieren";
-App::$strings["Allow embedded HTML content only from these domains"] = "Eingebetteten HTML Inhalt von folgenden Domains erlauben";
-App::$strings["One site per line. Leave empty to allow from any site by default"] = "Eine Seite pro Zeile. Leerlassen um von jeder Seite zuzulassen. ";
+App::$strings["Only allow embeds from secure (SSL) websites and links."] = "Erlaube Einbettungen nur von sicheren (SSL) Webseiten und Links.";
+App::$strings["Allow unfiltered embedded HTML content only from these domains"] = "Erlaube Einbettung von Inhalten mit ungefiltertem HTML nur von diesen Domains";
+App::$strings["One site per line. By default embedded content is filtered."] = "Eine Website/Domain pro Zeile. Standardmäßig wird eingebetteter Inhalt gefiltert.";
 App::$strings["Block embedded HTML from these domains"] = "Eingebettete HTML Inhalte von diesen Seiten blockieren";
-App::$strings["Cooperative embed security"] = "Kooperative Einbettungssicherheit";
-App::$strings["Enable to share embed security with other compatible sites/hubs"] = "Teile die Einbettungssicherheit mit anderen kompatiblen Websites/Hubs.";
 App::$strings["Update has been marked successful"] = "Update wurde als erfolgreich markiert";
 App::$strings["Executing %s failed. Check system logs."] = "Ausführen von %s fehlgeschlagen. Überprüfe die Systemprotokolle.";
 App::$strings["Update %s was successfully applied."] = "Update %s wurde erfolgreich ausgeführt.";
@@ -241,6 +249,18 @@ App::$strings["Maximum project version: "] = "Maximale Version des Projekts:";
 App::$strings["Minimum PHP version: "] = "Minimale PHP Version:";
 App::$strings["Requires: "] = "Benötigt:";
 App::$strings["Disabled - version incompatibility"] = "Abgeschaltet - Versionsinkompatibilität";
+App::$strings["Enter the public git repository URL of the plugin repo."] = "Gib die öffentliche Git-Repository-URL des Plugin-Repository an.";
+App::$strings["Plugin repo git URL"] = "Plugin-Repository Git URL";
+App::$strings["Custom repo name"] = "Benutzerdefinierter Repository-Name";
+App::$strings["(optional)"] = "(optional)";
+App::$strings["Download Plugin Repo"] = "Plugin-Repository herunterladen";
+App::$strings["Install new repo"] = "Neues Repository installieren";
+App::$strings["Install"] = "Installieren";
+App::$strings["Cancel"] = "Abbrechen";
+App::$strings["Add Plugin Repo"] = "Plugin-Repository hinzufügen";
+App::$strings["Update"] = "Aktualisieren";
+App::$strings["Switch branch"] = "Zweig/Branch wechseln";
+App::$strings["Remove"] = "Entferne";
 App::$strings["No themes found."] = "Keine Theme gefunden.";
 App::$strings["Screenshot"] = "Bildschirmfoto";
 App::$strings["Themes"] = "Themes";
@@ -286,6 +306,7 @@ App::$strings["Location (URL) of app"] = "Ort (URL) der App";
 App::$strings["Description"] = "Beschreibung";
 App::$strings["Photo icon URL"] = "URL zum Icon";
 App::$strings["80 x 80 pixels - optional"] = "80 x 80 Pixel – optional";
+App::$strings["Categories (optional, comma separated list)"] = "Kategorien (optional, kommagetrennte Liste)";
 App::$strings["Version ID"] = "Versions-ID";
 App::$strings["Price of app"] = "Preis der App";
 App::$strings["Location (URL) to purchase app"] = "Ort (URL), um die App zu kaufen";
@@ -303,7 +324,6 @@ App::$strings["View"] = "Ansicht";
 App::$strings["Bookmark added"] = "Lesezeichen hinzugefügt";
 App::$strings["My Bookmarks"] = "Meine Lesezeichen";
 App::$strings["My Connections Bookmarks"] = "Lesezeichen meiner Kontakte";
-App::$strings["everybody"] = "alle";
 App::$strings["Permissions denied."] = "Berechtigung verweigert.";
 App::$strings["l, F j"] = "l, j. F";
 App::$strings["Link to Source"] = "Link zur Quelle";
@@ -318,7 +338,6 @@ App::$strings["You must be logged in to see this page."] = "Du musst angemeldet
 App::$strings["Posts and comments"] = "Beiträge und Kommentare";
 App::$strings["Only posts"] = "Nur Beiträge";
 App::$strings["Insufficient permissions.  Request redirected to profile page."] = "Unzureichende Zugriffsrechte. Die Anfrage wurde zur Profil-Seite umgeleitet.";
-App::$strings["Public"] = "Öffentlich";
 App::$strings["Room not found"] = "Chatraum nicht gefunden";
 App::$strings["Leave Room"] = "Raum verlassen";
 App::$strings["Delete Room"] = "Raum löschen";
@@ -428,6 +447,7 @@ App::$strings["Connection requests will be approved without your interaction"] =
 App::$strings["This connection's primary address is"] = "Die Hauptadresse der Verbindung ist";
 App::$strings["Available locations:"] = "Verfügbare Klone:";
 App::$strings["The permissions indicated on this page will be applied to all new connections."] = "Die auf dieser Seite angegebenen Berechtigungen werden auf alle neuen Verbindungen angewendet.";
+App::$strings["Connection Tools"] = "Verbindungswerkzeuge";
 App::$strings["Slide to adjust your degree of friendship"] = "Verschieben, um den Grad der Freundschaft zu einzustellen";
 App::$strings["Rating"] = "Bewertung";
 App::$strings["Slide to adjust your rating"] = "Verschieben, um Deine Bewertung einzustellen";
@@ -468,7 +488,6 @@ App::$strings["select a photo from your photo albums"] = "ein Foto aus meinen Fo
 App::$strings["Crop Image"] = "Bild zuschneiden";
 App::$strings["Please adjust the image cropping for optimum viewing."] = "Bitte schneide das Bild für eine optimale Anzeige passend zu.";
 App::$strings["Done Editing"] = "Bearbeitung fertigstellen";
-App::$strings["\$Projectname channel"] = "\$Projectname-Kanal";
 App::$strings["Public access denied."] = "Öffentlichen Zugriff verweigert.";
 App::$strings["%d rating"] = array(
 	0 => "%d Bewertung",
@@ -517,41 +536,14 @@ App::$strings["mail recalled"] = "Mail widerrufen";
 App::$strings["duplicate mail received"] = "Doppelte Mail erhalten";
 App::$strings["mail delivered"] = "Mail zugestellt";
 App::$strings["Item not found"] = "Element nicht gefunden";
-App::$strings["Delete block?"] = "Block löschen?";
-App::$strings["Bold"] = "Fett";
-App::$strings["Italic"] = "Kursiv";
-App::$strings["Underline"] = "Unterstrichen";
-App::$strings["Quote"] = "Zitat";
-App::$strings["Code"] = "Code";
-App::$strings["Upload photo"] = "Foto hochladen";
-App::$strings["Attach file"] = "Datei anhängen";
-App::$strings["Insert YouTube video"] = "YouTube-Video einfügen";
-App::$strings["Insert Vorbis [.ogg] video"] = "Vorbis [.ogg]-Video einfügen";
-App::$strings["Insert Vorbis [.ogg] audio"] = "Vorbis [.ogg]-Audio einfügen";
-App::$strings["Set your location"] = "Standort";
-App::$strings["Clear browser location"] = "Browser-Standort löschen";
-App::$strings["Please wait"] = "Bitte warten";
-App::$strings["Permission settings"] = "Berechtigungs-Einstellungen";
-App::$strings["Public post"] = "Öffentlicher Beitrag";
 App::$strings["Title (optional)"] = "Titel (optional)";
-App::$strings["Categories (optional, comma-separated list)"] = "Kategorien (optional, kommagetrennte Liste)";
-App::$strings["Example: bob@example.com, mary@example.com"] = "Beispiel: bob@example.com, mary@example.com";
-App::$strings["Preview"] = "Vorschau";
-App::$strings["Set expiration date"] = "Verfallsdatum";
 App::$strings["Edit Block"] = "Block bearbeiten";
-App::$strings["Delete layout?"] = "Layout löschen?";
-App::$strings["Layout Description (Optional)"] = "Layout-Beschreibung (optional)";
 App::$strings["Layout Name"] = "Layout-Name";
+App::$strings["Layout Description (Optional)"] = "Layout-Beschreibung (optional)";
 App::$strings["Edit Layout"] = "Layout bearbeiten";
 App::$strings["Item is not editable"] = "Element kann nicht bearbeitet werden.";
-App::$strings["Expires YYYY-MM-DD HH:MM"] = "Verfällt YYYY-MM-DD HH;MM";
-App::$strings["Delete item?"] = "Eintrag löschen?";
-App::$strings["Toggle voting"] = "Umfragewerkzeug aktivieren";
-App::$strings["OK"] = "Ok";
-App::$strings["Cancel"] = "Abbrechen";
 App::$strings["Edit post"] = "Bearbeite Beitrag";
-App::$strings["Delete webpage?"] = "Webseite löschen?";
-App::$strings["Page link title"] = "Seitentitel-Link";
+App::$strings["Page link"] = "Seiten-Link";
 App::$strings["Edit Webpage"] = "Webseite bearbeiten";
 App::$strings["Calendar entries imported."] = "Kalendereinträge wurden importiert.";
 App::$strings["No calendar entries found."] = "Keine Kalendereinträge gefunden.";
@@ -576,6 +568,8 @@ App::$strings["Edit Description"] = "Beschreibung bearbeiten";
 App::$strings["Edit Location"] = "Ort bearbeiten";
 App::$strings["Location"] = "Ort";
 App::$strings["Share this event"] = "Den Termin teilen";
+App::$strings["Preview"] = "Vorschau";
+App::$strings["Permission settings"] = "Berechtigungs-Einstellungen";
 App::$strings["Advanced Options"] = "Weitere Optionen";
 App::$strings["Edit event"] = "Termin bearbeiten";
 App::$strings["Delete event"] = "Termin löschen";
@@ -761,11 +755,14 @@ App::$strings["Selected channel has private message restrictions. Send failed."]
 App::$strings["Messages"] = "Nachrichten";
 App::$strings["Message recalled."] = "Nachricht widerrufen.";
 App::$strings["Conversation removed."] = "Unterhaltung gelöscht.";
+App::$strings["Expires YYYY-MM-DD HH:MM"] = "Verfällt YYYY-MM-DD HH;MM";
 App::$strings["Requested channel is not in this network"] = "Angeforderter Kanal ist nicht in diesem Netzwerk.";
 App::$strings["Send Private Message"] = "Private Nachricht senden";
 App::$strings["To:"] = "An:";
 App::$strings["Subject:"] = "Betreff:";
+App::$strings["Attach file"] = "Datei anhängen";
 App::$strings["Send"] = "Absenden";
+App::$strings["Set expiration date"] = "Verfallsdatum";
 App::$strings["Delete message"] = "Nachricht löschen";
 App::$strings["Delivery report"] = "Zustellungsbericht";
 App::$strings["Recall message"] = "Nachricht widerrufen";
@@ -907,7 +904,6 @@ App::$strings["Use as profile photo"] = "Als Profilfoto verwenden";
 App::$strings["Use as cover photo"] = "Als Titelbild verwenden";
 App::$strings["Private Photo"] = "Privates Foto";
 App::$strings["View Full Size"] = "In voller Größe anzeigen";
-App::$strings["Remove"] = "Entferne";
 App::$strings["Edit photo"] = "Foto bearbeiten";
 App::$strings["Rotate CW (right)"] = "Drehen im UZS (rechts)";
 App::$strings["Rotate CCW (left)"] = "Drehen gegen UZS (links)";
@@ -919,6 +915,7 @@ App::$strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Beispiele:
 App::$strings["Flag as adult in album view"] = "In der Albumansicht als nicht jugendfrei markieren";
 App::$strings["I like this (toggle)"] = "Mir gefällt das (Umschalter)";
 App::$strings["I don't like this (toggle)"] = "Mir gefällt das nicht (Umschalter)";
+App::$strings["Please wait"] = "Bitte warten";
 App::$strings["This is you"] = "Das bist Du";
 App::$strings["Comment"] = "Kommentar";
 App::$strings["__ctx:title__ Likes"] = "Gefällt mir";
@@ -938,6 +935,7 @@ App::$strings["__ctx:noun__ Dislike"] = array(
 	0 => "Gefällt nicht",
 	1 => "Gefällt nicht",
 );
+App::$strings["Photo Tools"] = "Fotowerkzeuge";
 App::$strings["In This Photo:"] = "Auf diesem Foto:";
 App::$strings["Map"] = "Karte";
 App::$strings["__ctx:noun__ Likes"] = "Gefällt mir";
@@ -982,6 +980,7 @@ App::$strings["Hide your connections list from viewers of this profile"] = "Dein
 App::$strings["Edit Profile Details"] = "Bearbeite Profil-Details";
 App::$strings["View this profile"] = "Dieses Profil ansehen";
 App::$strings["Edit visibility"] = "Sichtbarkeit bearbeiten";
+App::$strings["Profile Tools"] = "Profilwerkzeuge";
 App::$strings["Change cover photo"] = "Titelbild ändern";
 App::$strings["Change profile photo"] = "Profilfoto ändern";
 App::$strings["Create a new profile using these settings"] = "Neues Profil anlegen und diese Einstellungen übernehmen";
@@ -1098,7 +1097,6 @@ App::$strings["Search results for: %s"] = "Suchergebnisse für: %s";
 App::$strings["No service class restrictions found."] = "Keine Dienstklassenbeschränkungen gefunden.";
 App::$strings["Name is required"] = "Name ist erforderlich";
 App::$strings["Key and Secret are required"] = "Schlüssel und Geheimnis werden benötigt";
-App::$strings["Update"] = "Aktualisieren";
 App::$strings["Not valid email."] = "Keine gültige E-Mail Adresse.";
 App::$strings["Protected email address. Cannot change to that email."] = "Geschützte E-Mail Adresse. Diese kann nicht verändert werden.";
 App::$strings["System failure storing new email. Please try again."] = "Systemfehler während des Speicherns der neuen Mail. Bitte versuche es noch einmal.";
@@ -1194,6 +1192,7 @@ App::$strings["0 or blank to use the website limit. The website expires after %d
 App::$strings["Maximum Friend Requests/Day:"] = "Maximale Kontaktanfragen pro Tag:";
 App::$strings["May reduce spam activity"] = "Kann die Spam-Aktivität verringern";
 App::$strings["Default Post Permissions"] = "Standardeinstellungen für Beitrags-Zugriffsrechte";
+App::$strings["Use my default audience setting for the type of post"] = "Benutze meine Standard-Zielgruppen-Einstellungen für diesen Beitragstyp";
 App::$strings["Channel permissions category:"] = "Zugriffsrechte-Kategorie des Kanals:";
 App::$strings["Maximum private messages per day from unknown people:"] = "Maximale Anzahl privater Nachrichten pro Tag von unbekannten Leuten:";
 App::$strings["Useful to reduce spamming"] = "Nützlich, um Spam zu verringern";
@@ -1268,6 +1267,8 @@ App::$strings["Please select a default timezone for your website"] = "Standard-Z
 App::$strings["Site settings"] = "Seiteneinstellungen";
 App::$strings["Enable \$Projectname <strong>advanced</strong> features?"] = "<strong>Erweiterte</strong> Funktionen für \$Projectname aktivieren?";
 App::$strings["Some advanced features, while useful - may be best suited for technically proficient audiences"] = "Einige erweiterte Funktionen können ungeachtet ihrer Nützlichkeit eher für eine technisch versierte Zielgruppe geeignet sein.";
+App::$strings["PHP version 5.4 or greater is required."] = "PHP wird in Version 5.4 oder höher benötigt.";
+App::$strings["PHP version"] = "PHP-Version";
 App::$strings["Could not find a command line version of PHP in the web server PATH."] = "Konnte die Kommandozeilen-Version von PHP nicht im PATH des Web-Servers finden.";
 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."] = "Ohne Kommandozeilen-Version von PHP auf dem Server wirst Du nicht in der Lage sein, Hintergrundprozesse via cron auszuführen.";
 App::$strings["PHP executable path"] = "PHP Pfad zu ausführbarer Datei";
@@ -1353,6 +1354,7 @@ App::$strings["Import all or selected content from the following channel into th
 App::$strings["Only import content with these words (one per line)"] = "Importiere nur Beiträge, die folgende Wörter (eines pro Zeile) enthalten";
 App::$strings["Leave blank to import all public content"] = "Leer lassen, um alle öffentlichen Beiträge zu importieren";
 App::$strings["Channel Name"] = "Name des Kanals";
+App::$strings["Add the following categories to posts imported from this source (comma separated)"] = "Füge die folgenden Kategorien zu Beiträgen, die aus dieser Quelle importiert werden, hinzu (kommagetrennt)";
 App::$strings["Source not found."] = "Quelle nicht gefunden.";
 App::$strings["Edit Source"] = "Quelle bearbeiten";
 App::$strings["Delete Source"] = "Quelle löschen";
@@ -1451,64 +1453,15 @@ App::$strings["School/education:"] = "Schule/Ausbildung:";
 App::$strings["Like this thing"] = "Gefällt mir";
 App::$strings["created a new post"] = "Neuer Beitrag wurde erzeugt";
 App::$strings["commented on %s's post"] = "hat %s's Beitrag kommentiert";
-App::$strings["Private Message"] = "Private Nachricht";
-App::$strings["Select"] = "Auswählen";
-App::$strings["Save to Folder"] = "In Ordner speichern";
-App::$strings["I will attend"] = "Ich werde teilnehmen";
-App::$strings["I will not attend"] = "Ich werde nicht teilnehmen";
-App::$strings["I might attend"] = "Ich werde vielleicht teilnehmen";
-App::$strings["I agree"] = "Ich stimme zu";
-App::$strings["I disagree"] = "Ich lehne ab";
-App::$strings["I abstain"] = "Ich enthalte mich";
-App::$strings["Add Star"] = "Stern hinzufügen";
-App::$strings["Remove Star"] = "Stern entfernen";
-App::$strings["Toggle Star Status"] = "Markierungsstatus (Stern) umschalten";
-App::$strings["starred"] = "markiert";
-App::$strings["Message signature validated"] = "Signatur überprüft";
-App::$strings["Message signature incorrect"] = "Signatur nicht korrekt";
-App::$strings["Add Tag"] = "Tag hinzufügen";
-App::$strings["like"] = "mag";
-App::$strings["dislike"] = "verurteile";
-App::$strings["Share This"] = "Teilen";
-App::$strings["share"] = "Teilen";
-App::$strings["Delivery Report"] = "Zustellungsbericht";
-App::$strings["%d comment"] = array(
-	0 => "%d Kommentar",
-	1 => "%d Kommentare",
-);
-App::$strings["View %s's profile - %s"] = "Schaue Dir %ss Profil an – %s";
-App::$strings["to"] = "an";
-App::$strings["via"] = "via";
-App::$strings["Wall-to-Wall"] = "Wall-to-Wall";
-App::$strings["via Wall-To-Wall:"] = "via Wall-To-Wall:";
-App::$strings["from %s"] = "via %s";
-App::$strings["last edited: %s"] = "zuletzt bearbeitet: %s";
-App::$strings["Expires: %s"] = "Verfällt: %s";
-App::$strings["Save Bookmarks"] = "Favoriten speichern";
-App::$strings["Add to Calendar"] = "Zum Kalender hinzufügen";
-App::$strings["Mark all seen"] = "Alle als gelesen markieren";
-App::$strings["[+] show all"] = "[+] Alle anzeigen";
-App::$strings["Image"] = "Bild";
-App::$strings["Insert Link"] = "Link einfügen";
-App::$strings["Video"] = "Video";
-App::$strings["Not a valid email address"] = "Ungültige E-Mail-Adresse";
-App::$strings["Your email domain is not among those allowed on this site"] = "Deine E-Mail-Adresse ist auf dieser Seite nicht erlaubt";
-App::$strings["Your email address is already registered at this site."] = "Deine E-Mail-Adresse ist auf dieser Seite bereits registriert.";
-App::$strings["An invitation is required."] = "Eine Einladung wird benötigt.";
-App::$strings["Invitation could not be verified."] = "Die Einladung konnte nicht bestätigt werden.";
-App::$strings["Please enter the required information."] = "Bitte gib die benötigten Informationen ein.";
-App::$strings["Failed to store account information."] = "Speichern der Nutzerkontodaten fehlgeschlagen.";
-App::$strings["Registration confirmation for %s"] = "Registrierungsbestätigung für %s";
-App::$strings["Registration request at %s"] = "Registrierungsanfrage auf %s";
-App::$strings["Administrator"] = "Administrator";
-App::$strings["your registration password"] = "Dein Registrierungspasswort";
-App::$strings["Registration details for %s"] = "Registrierungsdetails für %s";
-App::$strings["Account approved."] = "Nutzerkonto bestätigt.";
-App::$strings["Registration revoked for %s"] = "Registrierung für %s wurde widerrufen";
-App::$strings["Account verified. Please login."] = "Nutzerkonto wurde bestätigt. Bitte melde Dich an!";
-App::$strings["Click here to upgrade."] = "Klicke hier, um das Upgrade durchzuführen.";
-App::$strings["This action exceeds the limits set by your subscription plan."] = "Diese Aktion überschreitet die Grenzen Ihres Abonnements.";
-App::$strings["This action is not available under your subscription plan."] = "Diese Aktion ist in Ihrem Abonnement nicht verfügbar.";
+App::$strings["Embedded content"] = "Eingebetteter Inhalt";
+App::$strings["Embedding disabled"] = "Einbetten ausgeschaltet";
+App::$strings["Visible to your default audience"] = "Standard-Sichtbarkeit gemäß Kanaleinstellungen";
+App::$strings["Limit access:"] = "Beschränke Zugriff:";
+App::$strings["Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit the scope of \"Show\"."] = "Wähle \"Anzeigen\", um Betrachtung zuzulassen. \"Nicht anzeigen\" überstimmt und limitiert den Aktionsradius von \"Anzeigen\" für Ausnahmen.";
+App::$strings["Show"] = "Anzeigen";
+App::$strings["Don't show"] = "Nicht anzeigen";
+App::$strings["Other networks and post services"] = "Andere Netzwerke und Platformen";
+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."] = "Beitragsberechtigungen %s können nicht geändert werden %s, nachdem der Beitrag gesendet wurde.<br />Diese Berechtigungen bestimmen, wer den Beitrag sehen kann.";
 App::$strings["Currently Male"] = "Momentan männlich";
 App::$strings["Currently Female"] = "Momentan weiblich";
 App::$strings["Mostly Male"] = "Größtenteils männlich";
@@ -1564,176 +1517,11 @@ App::$strings["Uncertain"] = "Ungewiss";
 App::$strings["It's complicated"] = "Es ist kompliziert";
 App::$strings["Don't care"] = "Interessiert mich nicht";
 App::$strings["Ask me"] = "Frag mich mal";
-App::$strings["Visible to your default audience"] = "Standard-Sichtbarkeit gemäß Kanaleinstellungen";
-App::$strings["Show"] = "Anzeigen";
-App::$strings["Don't show"] = "Nicht anzeigen";
-App::$strings["Other networks and post services"] = "Andere Netzwerke und Platformen";
 App::$strings[" and "] = "und";
 App::$strings["public profile"] = "öffentliches Profil";
 App::$strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s hat %2\$s auf &ldquo;%3\$s&rdquo; geändert";
 App::$strings["Visit %1\$s's %2\$s"] = "Besuche %1\$s's %2\$s";
 App::$strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s hat ein aktualisiertes %2\$s, %3\$s wurde verändert.";
-App::$strings["Public Timeline"] = "Öffentliche Zeitleiste";
-App::$strings["Site Admin"] = "Hub-Administration";
-App::$strings["Bookmarks"] = "Lesezeichen";
-App::$strings["Address Book"] = "Adressbuch";
-App::$strings["Login"] = "Anmelden";
-App::$strings["Grid"] = "Grid";
-App::$strings["Channel Home"] = "Mein Kanal";
-App::$strings["Events"] = "Termine";
-App::$strings["Directory"] = "Verzeichnis";
-App::$strings["Mail"] = "Mail";
-App::$strings["Chat"] = "Chat";
-App::$strings["Probe"] = "Testen";
-App::$strings["Suggest"] = "Empfehlen";
-App::$strings["Random Channel"] = "Zufälliger Kanal";
-App::$strings["Invite"] = "Einladen";
-App::$strings["Features"] = "Funktionen";
-App::$strings["Post"] = "Beitrag schreiben";
-App::$strings["Install"] = "Installieren";
-App::$strings["Purchase"] = "Kaufen";
-App::$strings["view full size"] = "In Vollbildansicht anschauen";
-App::$strings["\$Projectname Notification"] = "\$Projectname-Benachrichtigung";
-App::$strings["\$projectname"] = "\$projectname";
-App::$strings["Thank You,"] = "Danke.";
-App::$strings["%s Administrator"] = "der Administrator von %s";
-App::$strings["No Subject"] = "Kein Betreff";
-App::$strings["Attachments:"] = "Anhänge:";
-App::$strings["l F d, Y \\@ g:i A"] = "l, d. F Y, H:i";
-App::$strings["\$Projectname event notification:"] = "\$Projectname-Terminbenachrichtigung:";
-App::$strings["Starts:"] = "Beginnt:";
-App::$strings["Finishes:"] = "Endet:";
-App::$strings["Image/photo"] = "Bild/Foto";
-App::$strings["Encrypted content"] = "Verschlüsselter Inhalt";
-App::$strings["Install %s element: "] = "Element %s installieren: ";
-App::$strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Dieser Beitrag beinhaltet ein installierbares %s Element, aber Du hast nicht die nötigen Rechte, um es auf diesem Hub zu installieren.";
-App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s schrieb den folgenden %2\$s %3\$s";
-App::$strings["Different viewers will see this text differently"] = "Verschiedene Betrachter werden diesen Text unterschiedlich sehen";
-App::$strings["$1 spoiler"] = "$1 Spoiler";
-App::$strings["$1 wrote:"] = "$1 schrieb:";
-App::$strings["%1\$s is now connected with %2\$s"] = "%1\$s ist jetzt mit %2\$s verbunden";
-App::$strings["%1\$s poked %2\$s"] = "%1\$s stupste %2\$s an";
-App::$strings["poked"] = "stupste";
-App::$strings["View %s's profile @ %s"] = "%ss Profil auf %s ansehen";
-App::$strings["Categories:"] = "Kategorien:";
-App::$strings["Filed under:"] = "Gespeichert unter:";
-App::$strings["View in context"] = "Im Zusammenhang anschauen";
-App::$strings["remove"] = "lösche";
-App::$strings["Loading..."] = "Lädt ...";
-App::$strings["Delete Selected Items"] = "Lösche die ausgewählten Elemente";
-App::$strings["View Source"] = "Quelle anzeigen";
-App::$strings["Follow Thread"] = "Unterhaltung folgen";
-App::$strings["Unfollow Thread"] = "Unterhaltung nicht mehr folgen";
-App::$strings["Activity/Posts"] = "Aktivitäten/Beiträge";
-App::$strings["Edit Connection"] = "Verbindung bearbeiten";
-App::$strings["Message"] = "Nachricht";
-App::$strings["%s likes this."] = "%s gefällt das.";
-App::$strings["%s doesn't like this."] = "%s gefällt das nicht.";
-App::$strings["<span  %1\$s>%2\$d people</span> like this."] = array(
-	0 => "<span  %1\$s>%2\$d Person</span> gefällt das.",
-	1 => "<span  %1\$s>%2\$d Leuten</span> gefällt das.",
-);
-App::$strings["<span  %1\$s>%2\$d people</span> don't like this."] = array(
-	0 => "<span  %1\$s>%2\$d Person</span> gefällt das nicht.",
-	1 => "<span  %1\$s>%2\$d Leuten</span> gefällt das nicht.",
-);
-App::$strings["and"] = "und";
-App::$strings[", and %d other people"] = array(
-	0 => "",
-	1 => ", und %d andere",
-);
-App::$strings["%s like this."] = "%s gefällt das.";
-App::$strings["%s don't like this."] = "%s gefällt das nicht.";
-App::$strings["Visible to <strong>everybody</strong>"] = "Sichtbar für <strong>jeden</strong>";
-App::$strings["Please enter a video link/URL:"] = "Gib einen Video-Link/URL ein:";
-App::$strings["Please enter an audio link/URL:"] = "Gib einen Audio-Link/URL ein:";
-App::$strings["Tag term:"] = "Schlagwort:";
-App::$strings["Where are you right now?"] = "Wo bist Du jetzt grade?";
-App::$strings["Page link name"] = "Link zur Seite";
-App::$strings["Post as"] = "Veröffentlichen als";
-App::$strings["upload photo"] = "Foto hochladen";
-App::$strings["attach file"] = "Datei anfügen";
-App::$strings["web link"] = "Web-Link";
-App::$strings["Insert video link"] = "Video-Link einfügen";
-App::$strings["video link"] = "Video-Link";
-App::$strings["Insert audio link"] = "Audio-Link einfügen";
-App::$strings["audio link"] = "Audio-Link";
-App::$strings["set location"] = "Standort";
-App::$strings["clear location"] = "Standort löschen";
-App::$strings["permissions"] = "Berechtigungen";
-App::$strings["Set publish date"] = "Veröffentlichungsdatum festlegen";
-App::$strings["Discover"] = "Entdecken";
-App::$strings["Imported public streams"] = "Importierte öffentliche Beiträge";
-App::$strings["Commented Order"] = "Neueste Kommentare";
-App::$strings["Sort by Comment Date"] = "Nach Kommentardatum sortiert";
-App::$strings["Posted Order"] = "Neueste Beiträge";
-App::$strings["Sort by Post Date"] = "Nach Beitragsdatum sortiert";
-App::$strings["Posts that mention or involve you"] = "Beiträge mit Beteiligung Deinerseits";
-App::$strings["Activity Stream - by date"] = "Activity Stream – nach Datum sortiert";
-App::$strings["Starred"] = "Markiert";
-App::$strings["Favourite Posts"] = "Markierte Beiträge";
-App::$strings["Spam"] = "Spam";
-App::$strings["Posts flagged as SPAM"] = "Nachrichten, die als SPAM markiert wurden";
-App::$strings["Status Messages and Posts"] = "Statusnachrichten und Beiträge";
-App::$strings["About"] = "Ãœber";
-App::$strings["Profile Details"] = "Profil-Details";
-App::$strings["Photo Albums"] = "Fotoalben";
-App::$strings["Files and Storage"] = "Dateien und Speicher";
-App::$strings["Chatrooms"] = "Chaträume";
-App::$strings["Saved Bookmarks"] = "Gespeicherte Lesezeichen";
-App::$strings["Manage Webpages"] = "Webseiten verwalten";
-App::$strings["__ctx:noun__ Attending"] = array(
-	0 => "Zusage",
-	1 => "Zusagen",
-);
-App::$strings["__ctx:noun__ Not Attending"] = array(
-	0 => "Absage",
-	1 => "Absagen",
-);
-App::$strings["__ctx:noun__ Undecided"] = array(
-	0 => " Unentschlossen",
-	1 => "Unentschlossene",
-);
-App::$strings["__ctx:noun__ Agree"] = array(
-	0 => "Zustimmung",
-	1 => "Zustimmungen",
-);
-App::$strings["__ctx:noun__ Disagree"] = array(
-	0 => "Ablehnung",
-	1 => "Ablehnungen",
-);
-App::$strings["__ctx:noun__ Abstain"] = array(
-	0 => "Enthaltung",
-	1 => "Enthaltungen",
-);
-App::$strings["%1\$s's bookmarks"] = "%1\$ss Lesezeichen";
-App::$strings["Missing room name"] = "Der Chatraum hat keinen Namen";
-App::$strings["Duplicate room name"] = "Name des Chatraums bereits vergeben";
-App::$strings["Invalid room specifier."] = "Ungültiger Raumbezeichner.";
-App::$strings["Room not found."] = "Chatraum konnte nicht gefunden werden.";
-App::$strings["Room is full"] = "Der Chatraum ist voll";
-App::$strings["New window"] = "Neues Fenster";
-App::$strings["Open the selected location in a different window or browser tab"] = "Öffne die markierte Adresse in einem neuen Browserfenster oder Tab";
-App::$strings["User '%s' deleted"] = "Benutzer '%s' gelöscht";
-App::$strings["Logged out."] = "Ausgeloggt.";
-App::$strings["Failed authentication"] = "Authentifizierung fehlgeschlagen";
-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."] = "Das Security-Token des Formulars war nicht korrekt. Das ist wahrscheinlich passiert, weil das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde.";
-App::$strings["Frequently"] = "Häufig";
-App::$strings["Hourly"] = "Stündlich";
-App::$strings["Twice daily"] = "Zwei Mal am Tag";
-App::$strings["Daily"] = "Täglich";
-App::$strings["Weekly"] = "Wöchentlich";
-App::$strings["Monthly"] = "Monatlich";
-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["%d invitation available"] = array(
 	0 => "%d Einladung verfügbar",
 	1 => "%d Einladungen verfügbar",
@@ -1753,6 +1541,189 @@ App::$strings["%d connection in common"] = array(
 	1 => "%d gemeinsame Verbindungen",
 );
 App::$strings["show more"] = "mehr zeigen";
+App::$strings["l F d, Y \\@ g:i A"] = "l, d. F Y, H:i";
+App::$strings["Starts:"] = "Beginnt:";
+App::$strings["Finishes:"] = "Endet:";
+App::$strings["This event has been added to your calendar."] = "Dieser Termin wurde zu Deinem Kalender hinzugefügt";
+App::$strings["Not specified"] = "Keine Angabe";
+App::$strings["Needs Action"] = "Aktion erforderlich";
+App::$strings["Completed"] = "Abgeschlossen";
+App::$strings["In Process"] = "In Bearbeitung";
+App::$strings["Cancelled"] = "gestrichen";
+App::$strings["Image exceeds website size limit of %lu bytes"] = "Bild überschreitet das Webseitenlimit von %lu Bytes";
+App::$strings["Image file is empty."] = "Bilddatei ist leer.";
+App::$strings["Photo storage failed."] = "Fotospeicherung fehlgeschlagen.";
+App::$strings["a new photo"] = "ein neues Foto";
+App::$strings["__ctx:photo_upload__ %1\$s posted %2\$s to %3\$s"] = "%1\$s hat %2\$s auf %3\$s veröffentlicht";
+App::$strings["Photo Albums"] = "Fotoalben";
+App::$strings["Upload New Photos"] = "Neue Fotos hochladen";
+App::$strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "Kann keinen doppelten Kanal-Identifikator auf diesem System erzeugen (Spitzname oder Hash schon belegt). Import fehlgeschlagen.";
+App::$strings["Channel clone failed. Import failed."] = "Klonen des Kanals fehlgeschlagen. Import fehlgeschlagen.";
+App::$strings["Invalid data packet"] = "Ungültiges Datenpaket";
+App::$strings["Unable to verify channel signature"] = "Konnte die Signatur des Kanals nicht verifizieren";
+App::$strings["Unable to verify site signature for %s"] = "Kann die Signatur der Seite von %s nicht verifizieren";
+App::$strings["invalid target signature"] = "Ungültige Signatur des Ziels";
+App::$strings["System"] = "System";
+App::$strings["New App"] = "Neue App";
+App::$strings["Suggestions"] = "Vorschläge";
+App::$strings["See more..."] = "Mehr anzeigen …";
+App::$strings["You have %1$.0f of %2$.0f allowed connections."] = "Du bist %1$.0f von maximal %2$.0f erlaubten Verbindungen eingegangen.";
+App::$strings["Add New Connection"] = "Neue Verbindung hinzufügen";
+App::$strings["Enter channel address"] = "Adresse des Kanals eingeben";
+App::$strings["Examples: bob@example.com, https://example.com/barbara"] = "Beispiele: bob@beispiel.com, http://beispiel.com/barbara";
+App::$strings["Notes"] = "Notizen";
+App::$strings["Remove term"] = "Eintrag löschen";
+App::$strings["Saved Searches"] = "Gespeicherte Suchanfragen";
+App::$strings["add"] = "hinzufügen";
+App::$strings["Archives"] = "Archive";
+App::$strings["Refresh"] = "Aktualisieren";
+App::$strings["Account settings"] = "Konto-Einstellungen";
+App::$strings["Channel settings"] = "Kanal-Einstellungen";
+App::$strings["Additional features"] = "Zusätzliche Funktionen";
+App::$strings["Feature/Addon settings"] = "Plugin-Einstellungen";
+App::$strings["Display settings"] = "Anzeige-Einstellungen";
+App::$strings["Manage locations"] = "Klon-Adressen verwalten";
+App::$strings["Export channel"] = "Kanal exportieren";
+App::$strings["Connected apps"] = "Verbundene Apps";
+App::$strings["Premium Channel Settings"] = "Premium-Kanal-Einstellungen";
+App::$strings["Private Mail Menu"] = "Private Nachrichten";
+App::$strings["Combined View"] = "Kombinierte Anzeige";
+App::$strings["Inbox"] = "Eingang";
+App::$strings["Outbox"] = "Ausgang";
+App::$strings["New Message"] = "Neue Nachricht";
+App::$strings["Conversations"] = "Konversationen";
+App::$strings["Received Messages"] = "Erhaltene Nachrichten";
+App::$strings["Sent Messages"] = "Gesendete Nachrichten";
+App::$strings["No messages."] = "Keine Nachrichten.";
+App::$strings["Delete conversation"] = "Unterhaltung löschen";
+App::$strings["Events Menu"] = "Kalendermenü";
+App::$strings["Day View"] = "Tagesansicht";
+App::$strings["Week View"] = "Wochenansicht";
+App::$strings["Month View"] = "Monatsansicht";
+App::$strings["Events Tools"] = "Kalenderwerkzeuge";
+App::$strings["Export Calendar"] = "Kalender exportieren";
+App::$strings["Import Calendar"] = "Kalender importieren";
+App::$strings["Chatrooms"] = "Chaträume";
+App::$strings["Overview"] = "Ãœbersicht";
+App::$strings["Chat Members"] = "Chatmitglieder";
+App::$strings["Bookmarked Chatrooms"] = "Gespeicherte Chatrooms";
+App::$strings["Suggested Chatrooms"] = "Chatraum-Vorschläge";
+App::$strings["photo/image"] = "Foto/Bild";
+App::$strings["Click to show more"] = "Klick, um mehr anzuzeigen";
+App::$strings["Rating Tools"] = "Bewertungswerkzeuge";
+App::$strings["Rate Me"] = "Bewerte mich";
+App::$strings["View Ratings"] = "Bewertungen ansehen";
+App::$strings["Forums"] = "Foren";
+App::$strings["Tasks"] = "Aufgaben";
+App::$strings["Documentation"] = "Dokumentation";
+App::$strings["Project/Site Information"] = "Informationen über das Projekt und diesen Hub";
+App::$strings["For Members"] = "Für Mitglieder";
+App::$strings["For Administrators"] = "Für Administratoren";
+App::$strings["For Developers"] = "Für Entwickler";
+App::$strings["Accounts"] = "Konten";
+App::$strings["Member registrations waiting for confirmation"] = "Nutzer-Anmeldungen, die auf Bestätigung warten";
+App::$strings["Features"] = "Funktionen";
+App::$strings["Inspect queue"] = "Warteschlange kontrollieren";
+App::$strings["DB updates"] = "DB-Aktualisierungen";
+App::$strings["Admin"] = "Administration";
+App::$strings["Plugin Features"] = "Plug-In Funktionen";
+App::$strings["%1\$s's bookmarks"] = "%1\$ss Lesezeichen";
+App::$strings["Missing room name"] = "Der Chatraum hat keinen Namen";
+App::$strings["Duplicate room name"] = "Name des Chatraums bereits vergeben";
+App::$strings["Invalid room specifier."] = "Ungültiger Raumbezeichner.";
+App::$strings["Room not found."] = "Chatraum konnte nicht gefunden werden.";
+App::$strings["Room is full"] = "Der Chatraum ist voll";
+App::$strings["New window"] = "Neues Fenster";
+App::$strings["Open the selected location in a different window or browser tab"] = "Öffne die markierte Adresse in einem neuen Browserfenster oder Tab";
+App::$strings["User '%s' deleted"] = "Benutzer '%s' gelöscht";
+App::$strings["Logged out."] = "Ausgeloggt.";
+App::$strings["Failed authentication"] = "Authentifizierung fehlgeschlagen";
+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."] = "Das Security-Token des Formulars war nicht korrekt. Das ist wahrscheinlich passiert, weil das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde.";
+App::$strings["(Unknown)"] = "(Unbekannt)";
+App::$strings["Visible to anybody on the internet."] = "Für jeden im Internet sichtbar.";
+App::$strings["Visible to you only."] = "Nur für Dich sichtbar.";
+App::$strings["Visible to anybody in this network."] = "Für jedes \$Projectname-Mitglied sichtbar.";
+App::$strings["Visible to anybody authenticated."] = "Für jeden sichtbar, der angemeldet ist.";
+App::$strings["Visible to anybody on %s."] = "Für jeden auf %s sichtbar.";
+App::$strings["Visible to all connections."] = "Für alle Verbindungen sichtbar.";
+App::$strings["Visible to approved connections."] = "Nur für akzeptierte Verbindungen sichtbar.";
+App::$strings["Visible to specific connections."] = "Sichtbar für bestimmte Verbindungen.";
+App::$strings["Privacy group is empty."] = "Gruppe ist leer.";
+App::$strings["Privacy group: %s"] = "Gruppe: %s";
+App::$strings["Connection not found."] = "Die Verbindung wurde nicht gefunden.";
+App::$strings["profile photo"] = "Profilfoto";
+App::$strings["Logout"] = "Abmelden";
+App::$strings["End this session"] = "Beende diese Sitzung";
+App::$strings["Home"] = "Home";
+App::$strings["Your posts and conversations"] = "Deine Beiträge und Unterhaltungen";
+App::$strings["Your profile page"] = "Deine Profilseite";
+App::$strings["Manage/Edit profiles"] = "Profile verwalten";
+App::$strings["Edit your profile"] = "Profil bearbeiten";
+App::$strings["Your photos"] = "Deine Bilder";
+App::$strings["Your files"] = "Deine Dateien";
+App::$strings["Chat"] = "Chat";
+App::$strings["Your chatrooms"] = "Deine Chaträume";
+App::$strings["Bookmarks"] = "Lesezeichen";
+App::$strings["Your bookmarks"] = "Deine Lesezeichen";
+App::$strings["Your webpages"] = "Deine Webseiten";
+App::$strings["Login"] = "Anmelden";
+App::$strings["Sign in"] = "Anmelden";
+App::$strings["%s - click to logout"] = "%s - Klick zum Abmelden";
+App::$strings["Remote authentication"] = "Ãœber Konto auf anderem Server einloggen";
+App::$strings["Click to authenticate to your home hub"] = "Klicke, um Dich über Deinen Heimat-Server zu authentifizieren";
+App::$strings["Home Page"] = "Homepage";
+App::$strings["Create an account"] = "Erzeuge ein Konto";
+App::$strings["Help and documentation"] = "Hilfe und Dokumentation";
+App::$strings["Applications, utilities, links, games"] = "Anwendungen (Apps), Zubehör, Links, Spiele";
+App::$strings["Search site @name, #tag, ?docs, content"] = "Hub durchsuchen: @Name. #Schlagwort, ?Dokumentation, Inhalt";
+App::$strings["Directory"] = "Verzeichnis";
+App::$strings["Channel Directory"] = "Kanal-Verzeichnis";
+App::$strings["Grid"] = "Grid";
+App::$strings["Your grid"] = "Dein Grid";
+App::$strings["Mark all grid notifications seen"] = "Alle Grid-Benachrichtigungen als angesehen markieren";
+App::$strings["Channel Home"] = "Mein Kanal";
+App::$strings["Channel home"] = "Mein Kanal";
+App::$strings["Mark all channel notifications seen"] = "Markiere alle Kanal-Benachrichtigungen als angesehen";
+App::$strings["Notices"] = "Benachrichtigungen";
+App::$strings["Notifications"] = "Benachrichtigungen";
+App::$strings["See all notifications"] = "Alle Benachrichtigungen ansehen";
+App::$strings["Mail"] = "Mail";
+App::$strings["Private mail"] = "Persönliche Mail";
+App::$strings["See all private messages"] = "Alle persönlichen Nachrichten ansehen";
+App::$strings["Mark all private messages seen"] = "Markiere alle persönlichen Nachrichten als gesehen";
+App::$strings["Events"] = "Termine";
+App::$strings["Event Calendar"] = "Terminkalender";
+App::$strings["See all events"] = "Alle Termine ansehen";
+App::$strings["Mark all events seen"] = "Markiere alle Termine als gesehen";
+App::$strings["Manage Your Channels"] = "Verwalte Deine Kanäle";
+App::$strings["Account/Channel Settings"] = "Konto-/Kanal-Einstellungen";
+App::$strings["Site Setup and Configuration"] = "Seiten-Einrichtung und -Konfiguration";
+App::$strings["Loading..."] = "Lädt ...";
+App::$strings["@name, #tag, ?doc, content"] = "@Name, #Schlagwort, ?Dokumentation, Inhalt";
+App::$strings["Please wait..."] = "Bitte warten...";
+App::$strings["view full size"] = "In Vollbildansicht anschauen";
+App::$strings["\$Projectname Notification"] = "\$Projectname-Benachrichtigung";
+App::$strings["\$projectname"] = "\$projectname";
+App::$strings["Thank You,"] = "Danke.";
+App::$strings["%s Administrator"] = "der Administrator von %s";
+App::$strings["Administrator"] = "Administrator";
+App::$strings["No Subject"] = "Kein Betreff";
+App::$strings["Frequently"] = "Häufig";
+App::$strings["Hourly"] = "Stündlich";
+App::$strings["Twice daily"] = "Zwei Mal am Tag";
+App::$strings["Daily"] = "Täglich";
+App::$strings["Weekly"] = "Wöchentlich";
+App::$strings["Monthly"] = "Monatlich";
+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["Item was not found."] = "Beitrag wurde nicht gefunden.";
 App::$strings["No source file."] = "Keine Quelldatei.";
 App::$strings["Cannot locate file to replace"] = "Kann Datei zum Ersetzen nicht finden";
@@ -1844,12 +1815,51 @@ App::$strings["Name:"] = "Name:";
 App::$strings["Photo:"] = "Foto:";
 App::$strings["Please visit %s to approve or reject the suggestion."] = "Bitte besuche %s um den Vorschlag zu akzeptieren oder abzulehnen.";
 App::$strings["[Hubzilla:Notify]"] = "[Hubzilla:Benachrichtigung]";
-App::$strings["This event has been added to your calendar."] = "Dieser Termin wurde zu Deinem Kalender hinzugefügt";
-App::$strings["Not specified"] = "Keine Angabe";
-App::$strings["Needs Action"] = "Aktion erforderlich";
-App::$strings["Completed"] = "Abgeschlossen";
-App::$strings["In Process"] = "In Bearbeitung";
-App::$strings["Cancelled"] = "gestrichen";
+App::$strings["Private Message"] = "Private Nachricht";
+App::$strings["Select"] = "Auswählen";
+App::$strings["Save to Folder"] = "In Ordner speichern";
+App::$strings["I will attend"] = "Ich werde teilnehmen";
+App::$strings["I will not attend"] = "Ich werde nicht teilnehmen";
+App::$strings["I might attend"] = "Ich werde vielleicht teilnehmen";
+App::$strings["I agree"] = "Ich stimme zu";
+App::$strings["I disagree"] = "Ich lehne ab";
+App::$strings["I abstain"] = "Ich enthalte mich";
+App::$strings["Add Star"] = "Stern hinzufügen";
+App::$strings["Remove Star"] = "Stern entfernen";
+App::$strings["Toggle Star Status"] = "Markierungsstatus (Stern) umschalten";
+App::$strings["starred"] = "markiert";
+App::$strings["Message signature validated"] = "Signatur überprüft";
+App::$strings["Message signature incorrect"] = "Signatur nicht korrekt";
+App::$strings["Add Tag"] = "Tag hinzufügen";
+App::$strings["like"] = "mag";
+App::$strings["dislike"] = "verurteile";
+App::$strings["Share This"] = "Teilen";
+App::$strings["share"] = "Teilen";
+App::$strings["Delivery Report"] = "Zustellungsbericht";
+App::$strings["%d comment"] = array(
+	0 => "%d Kommentar",
+	1 => "%d Kommentare",
+);
+App::$strings["View %s's profile - %s"] = "Schaue Dir %ss Profil an – %s";
+App::$strings["to"] = "an";
+App::$strings["via"] = "via";
+App::$strings["Wall-to-Wall"] = "Wall-to-Wall";
+App::$strings["via Wall-To-Wall:"] = "via Wall-To-Wall:";
+App::$strings["from %s"] = "via %s";
+App::$strings["last edited: %s"] = "zuletzt bearbeitet: %s";
+App::$strings["Expires: %s"] = "Verfällt: %s";
+App::$strings["Save Bookmarks"] = "Favoriten speichern";
+App::$strings["Add to Calendar"] = "Zum Kalender hinzufügen";
+App::$strings["Mark all seen"] = "Alle als gelesen markieren";
+App::$strings["[+] show all"] = "[+] Alle anzeigen";
+App::$strings["Bold"] = "Fett";
+App::$strings["Italic"] = "Kursiv";
+App::$strings["Underline"] = "Unterstrichen";
+App::$strings["Quote"] = "Zitat";
+App::$strings["Code"] = "Code";
+App::$strings["Image"] = "Bild";
+App::$strings["Insert Link"] = "Link einfügen";
+App::$strings["Video"] = "Video";
 App::$strings["General Features"] = "Allgemeine Funktionen";
 App::$strings["Content Expiration"] = "Verfall von Inhalten";
 App::$strings["Remove posts/comments and/or private messages at a future time"] = "Ermöglicht das automatische Löschen von Beiträgen, Kommentaren und/oder privaten Nachrichten zu einem zukünftigen Datum.";
@@ -1894,7 +1904,6 @@ App::$strings["Search by Date"] = "Suche nach Datum";
 App::$strings["Ability to select posts by date ranges"] = "Möglichkeit, Beiträge nach Zeiträumen auszuwählen";
 App::$strings["Privacy Groups"] = "Gruppen";
 App::$strings["Enable management and selection of privacy groups"] = "Auswahl und Verwaltung von Gruppen für Kanäle aktivieren";
-App::$strings["Saved Searches"] = "Gespeicherte Suchanfragen";
 App::$strings["Save search terms for re-use"] = "Ermöglicht das Abspeichern von Suchbegriffen zur Wiederverwendung";
 App::$strings["Network Personal Tab"] = "Persönlicher Netzwerkreiter";
 App::$strings["Enable tab to display only Network posts that you've interacted on"] = "Aktiviert einen Reiter in der Grid-Ansicht, der nur Netzwerk-Beiträge anzeigt, mit denen Du interagiert hast";
@@ -1931,215 +1940,99 @@ App::$strings["edit"] = "Bearbeiten";
 App::$strings["Edit group"] = "Gruppe ändern";
 App::$strings["Add privacy group"] = "Gruppe hinzufügen";
 App::$strings["Channels not in any privacy group"] = "Kanäle, die in keiner Gruppe sind";
-App::$strings["add"] = "hinzufügen";
-App::$strings["(Unknown)"] = "(Unbekannt)";
-App::$strings["Visible to anybody on the internet."] = "Für jeden im Internet sichtbar.";
-App::$strings["Visible to you only."] = "Nur für Dich sichtbar.";
-App::$strings["Visible to anybody in this network."] = "Für jedes \$Projectname-Mitglied sichtbar.";
-App::$strings["Visible to anybody authenticated."] = "Für jeden sichtbar, der angemeldet ist.";
-App::$strings["Visible to anybody on %s."] = "Für jeden auf %s sichtbar.";
-App::$strings["Visible to all connections."] = "Für alle Verbindungen sichtbar.";
-App::$strings["Visible to approved connections."] = "Nur für akzeptierte Verbindungen sichtbar.";
-App::$strings["Visible to specific connections."] = "Sichtbar für bestimmte Verbindungen.";
-App::$strings["Privacy group is empty."] = "Gruppe ist leer.";
-App::$strings["Privacy group: %s"] = "Gruppe: %s";
-App::$strings["Connection not found."] = "Die Verbindung wurde nicht gefunden.";
-App::$strings["profile photo"] = "Profilfoto";
-App::$strings["Image exceeds website size limit of %lu bytes"] = "Bild überschreitet das Webseitenlimit von %lu Bytes";
-App::$strings["Image file is empty."] = "Bilddatei ist leer.";
-App::$strings["Photo storage failed."] = "Fotospeicherung fehlgeschlagen.";
-App::$strings["a new photo"] = "ein neues Foto";
-App::$strings["__ctx:photo_upload__ %1\$s posted %2\$s to %3\$s"] = "%1\$s hat %2\$s auf %3\$s veröffentlicht";
-App::$strings["Upload New Photos"] = "Neue Fotos hochladen";
-App::$strings["System"] = "System";
-App::$strings["Create Personal App"] = "Persönliche App erstellen";
-App::$strings["Edit Personal App"] = "Persönliche App bearbeiten";
-App::$strings["Suggestions"] = "Vorschläge";
-App::$strings["See more..."] = "Mehr anzeigen …";
-App::$strings["You have %1$.0f of %2$.0f allowed connections."] = "Du bist %1$.0f von maximal %2$.0f erlaubten Verbindungen eingegangen.";
-App::$strings["Add New Connection"] = "Neue Verbindung hinzufügen";
-App::$strings["Enter channel address"] = "Adresse des Kanals eingeben";
-App::$strings["Examples: bob@example.com, https://example.com/barbara"] = "Beispiele: bob@beispiel.com, http://beispiel.com/barbara";
-App::$strings["Notes"] = "Notizen";
-App::$strings["Remove term"] = "Eintrag löschen";
-App::$strings["Archives"] = "Archive";
-App::$strings["Refresh"] = "Aktualisieren";
-App::$strings["Account settings"] = "Konto-Einstellungen";
-App::$strings["Channel settings"] = "Kanal-Einstellungen";
-App::$strings["Additional features"] = "Zusätzliche Funktionen";
-App::$strings["Feature/Addon settings"] = "Plugin-Einstellungen";
-App::$strings["Display settings"] = "Anzeige-Einstellungen";
-App::$strings["Manage locations"] = "Klon-Adressen verwalten";
-App::$strings["Export channel"] = "Kanal exportieren";
-App::$strings["Connected apps"] = "Verbundene Apps";
-App::$strings["Premium Channel Settings"] = "Premium-Kanal-Einstellungen";
-App::$strings["Private Mail Menu"] = "Private Nachrichten";
-App::$strings["Combined View"] = "Kombinierte Anzeige";
-App::$strings["Inbox"] = "Eingang";
-App::$strings["Outbox"] = "Ausgang";
-App::$strings["New Message"] = "Neue Nachricht";
-App::$strings["Conversations"] = "Konversationen";
-App::$strings["Received Messages"] = "Erhaltene Nachrichten";
-App::$strings["Sent Messages"] = "Gesendete Nachrichten";
-App::$strings["No messages."] = "Keine Nachrichten.";
-App::$strings["Delete conversation"] = "Unterhaltung löschen";
-App::$strings["Events Menu"] = "Kalendermenü";
-App::$strings["Day View"] = "Tagesansicht";
-App::$strings["Week View"] = "Wochenansicht";
-App::$strings["Month View"] = "Monatsansicht";
-App::$strings["Events Tools"] = "Kalenderwerkzeuge";
-App::$strings["Export Calendar"] = "Kalender exportieren";
-App::$strings["Import Calendar"] = "Kalender importieren";
-App::$strings["Overview"] = "Ãœbersicht";
-App::$strings["Chat Members"] = "Chatmitglieder";
-App::$strings["Bookmarked Chatrooms"] = "Gespeicherte Chatrooms";
-App::$strings["Suggested Chatrooms"] = "Chatraum-Vorschläge";
-App::$strings["photo/image"] = "Foto/Bild";
-App::$strings["Click to show more"] = "Klick, um mehr anzuzeigen";
-App::$strings["Rating Tools"] = "Bewertungswerkzeuge";
-App::$strings["Rate Me"] = "Bewerte mich";
-App::$strings["View Ratings"] = "Bewertungen ansehen";
-App::$strings["Forums"] = "Foren";
-App::$strings["Tasks"] = "Aufgaben";
-App::$strings["Documentation"] = "Dokumentation";
-App::$strings["Project/Site Information"] = "Informationen über das Projekt und diesen Hub";
-App::$strings["For Members"] = "Für Mitglieder";
-App::$strings["For Administrators"] = "Für Administratoren";
-App::$strings["For Developers"] = "Für Entwickler";
-App::$strings["Accounts"] = "Konten";
-App::$strings["Member registrations waiting for confirmation"] = "Nutzer-Anmeldungen, die auf Bestätigung warten";
-App::$strings["Inspect queue"] = "Warteschlange kontrollieren";
-App::$strings["DB updates"] = "DB-Aktualisierungen";
-App::$strings["Admin"] = "Administration";
-App::$strings["Plugin Features"] = "Plug-In Funktionen";
-App::$strings["Tags"] = "Schlagwörter";
-App::$strings["Keywords"] = "Schlüsselwörter";
-App::$strings["have"] = "habe";
-App::$strings["has"] = "hat";
-App::$strings["want"] = "will";
-App::$strings["wants"] = "will";
-App::$strings["likes"] = "gefällt";
-App::$strings["dislikes"] = "missfällt";
-App::$strings["Delete this item?"] = "Dieses Element löschen?";
-App::$strings["[-] show less"] = "[-] Weniger anzeigen";
-App::$strings["[+] expand"] = "[+] aufklappen";
-App::$strings["[-] collapse"] = "[-] einklappen";
-App::$strings["Password too short"] = "Kennwort zu kurz";
-App::$strings["Passwords do not match"] = "Kennwörter stimmen nicht überein";
-App::$strings["Secret Passphrase"] = "geheime Passphrase";
-App::$strings["Passphrase hint"] = "Hinweis zur Passphrase";
-App::$strings["Notice: Permissions have changed but have not yet been submitted."] = "Achtung: Berechtigungen wurden verändert, aber noch nicht gespeichert.";
-App::$strings["close all"] = "Alle schließen";
-App::$strings["Nothing new here"] = "Nichts Neues hier";
-App::$strings["Rate This Channel (this is public)"] = "Diesen Kanal bewerten (öffentlich sichtbar)";
-App::$strings["Describe (optional)"] = "Beschreibung (optional)";
-App::$strings["Please enter a link URL"] = "Gib eine URL ein:";
-App::$strings["Unsaved changes. Are you sure you wish to leave this page?"] = "Ungespeicherte Änderungen. Bist Du sicher, dass Du diese Seite verlassen möchtest?";
-App::$strings["timeago.prefixAgo"] = "timeago.prefixAgo";
-App::$strings["timeago.prefixFromNow"] = " ";
-App::$strings["ago"] = "her";
-App::$strings["from now"] = "von jetzt";
-App::$strings["less than a minute"] = "weniger als eine Minute";
-App::$strings["about a minute"] = "ungefähr eine Minute";
-App::$strings["%d minutes"] = "%d Minuten";
-App::$strings["about an hour"] = "ungefähr eine Stunde";
-App::$strings["about %d hours"] = "ungefähr %d Stunden";
-App::$strings["a day"] = "ein Tag";
-App::$strings["%d days"] = "%d Tage";
-App::$strings["about a month"] = "ungefähr ein Monat";
-App::$strings["%d months"] = "%d Monate";
-App::$strings["about a year"] = "ungefähr ein Jahr";
-App::$strings["%d years"] = "%d Jahre";
-App::$strings[" "] = " ";
-App::$strings["timeago.numbers"] = "timeago.numbers";
-App::$strings["January"] = "Januar";
-App::$strings["February"] = "Februar";
-App::$strings["March"] = "März";
-App::$strings["April"] = "April";
-App::$strings["__ctx:long__ May"] = "Mai";
-App::$strings["June"] = "Juni";
-App::$strings["July"] = "Juli";
-App::$strings["August"] = "August";
-App::$strings["September"] = "September";
-App::$strings["October"] = "Oktober";
-App::$strings["November"] = "November";
-App::$strings["December"] = "Dezember";
-App::$strings["Jan"] = "Jan";
-App::$strings["Feb"] = "Feb";
-App::$strings["Mar"] = "Mär";
-App::$strings["Apr"] = "Apr";
-App::$strings["__ctx:short__ May"] = "Mai";
-App::$strings["Jun"] = "Jun";
-App::$strings["Jul"] = "Jul";
-App::$strings["Aug"] = "Aug";
-App::$strings["Sep"] = "Sep";
-App::$strings["Oct"] = "Okt";
-App::$strings["Nov"] = "Nov";
-App::$strings["Dec"] = "Dez";
-App::$strings["Sunday"] = "Sonntag";
-App::$strings["Monday"] = "Montag";
-App::$strings["Tuesday"] = "Dienstag";
-App::$strings["Wednesday"] = "Mittwoch";
-App::$strings["Thursday"] = "Donnerstag";
-App::$strings["Friday"] = "Freitag";
-App::$strings["Saturday"] = "Samstag";
-App::$strings["Sun"] = "So";
-App::$strings["Mon"] = "Mo";
-App::$strings["Tue"] = "Di";
-App::$strings["Wed"] = "Mi";
-App::$strings["Thu"] = "Do";
-App::$strings["Fri"] = "Fr";
-App::$strings["Sat"] = "Sa";
-App::$strings["__ctx:calendar__ today"] = "heute";
-App::$strings["__ctx:calendar__ month"] = "Monat";
-App::$strings["__ctx:calendar__ week"] = "Woche";
-App::$strings["__ctx:calendar__ day"] = "Tag";
-App::$strings["__ctx:calendar__ All day"] = "Ganztägig";
-App::$strings["No recipient provided."] = "Kein Empfänger angegeben";
-App::$strings["[no subject]"] = "[no subject]";
-App::$strings["Unable to determine sender."] = "Kann Absender nicht bestimmen.";
-App::$strings["Stored post could not be verified."] = "Gespeicherter Beitrag konnten nicht überprüft werden.";
-App::$strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "Kann keinen doppelten Kanal-Identifikator auf diesem System erzeugen (Spitzname oder Hash schon belegt). Import fehlgeschlagen.";
-App::$strings["Channel clone failed. Import failed."] = "Klonen des Kanals fehlgeschlagen. Import fehlgeschlagen.";
-App::$strings["Embedded content"] = "Eingebetteter Inhalt";
-App::$strings["Embedding disabled"] = "Einbetten ausgeschaltet";
-App::$strings["New Page"] = "Neue Seite";
-App::$strings["Title"] = "Titel";
-App::$strings["Can view my normal stream and posts"] = "Kann meine normalen Beiträge sehen";
-App::$strings["Can view my default channel profile"] = "Kann mein Standardprofil sehen";
-App::$strings["Can view my connections"] = "Kann meine Verbindungen sehen";
-App::$strings["Can view my file storage and photos"] = "Kann meine Datei- und Bilderordner sehen";
-App::$strings["Can view my webpages"] = "Kann meine Webseiten sehen";
-App::$strings["Can send me their channel stream and posts"] = "Kann mir die Beiträge aus seinem/ihrem Kanal schicken";
-App::$strings["Can post on my channel page (\"wall\")"] = "Kann auf meiner Kanal-Seite (\"wall\") Beiträge veröffentlichen";
-App::$strings["Can comment on or like my posts"] = "Darf meine Beiträge kommentieren und mögen/nicht mögen";
-App::$strings["Can send me private mail messages"] = "Kann mir private Nachrichten schicken";
-App::$strings["Can like/dislike stuff"] = "Kann andere Elemente mögen/nicht mögen";
-App::$strings["Profiles and things other than posts/comments"] = "Profile und alles außer Beiträge und Kommentare";
-App::$strings["Can forward to all my channel contacts via post @mentions"] = "Kann an alle meine Kontakte via @-Erwähnung Nachrichten weiterleiten";
-App::$strings["Advanced - useful for creating group forum channels"] = "Fortgeschritten - sinnvoll, um Gruppen-Kanäle/-Foren zu erstellen";
-App::$strings["Can chat with me (when available)"] = "Kann mit mir chatten (wenn verfügbar)";
-App::$strings["Can write to my file storage and photos"] = "Kann in meine Datei- und Bilderordner schreiben";
-App::$strings["Can edit my webpages"] = "Kann meine Webseiten bearbeiten";
-App::$strings["Can source my public posts in derived channels"] = "Kann meine öffentlichen Beiträge als Quellen für Kanäle verwenden";
-App::$strings["Somewhat advanced - very useful in open communities"] = "Etwas fortgeschritten – sehr nützlich in offenen Gemeinschaften";
-App::$strings["Can administer my channel resources"] = "Kann meine Kanäle administrieren";
-App::$strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Sehr fortgeschritten. Bearbeite das nur, wenn Du genau weißt, was Du tust";
-App::$strings["Social Networking"] = "Soziales Netzwerk";
-App::$strings["Social - Mostly Public"] = "Soziales Netzwerk - Weitgehend öffentlich";
-App::$strings["Social - Restricted"] = "Soziales Netzwerk - Beschränkt";
-App::$strings["Social - Private"] = "Soziales Netzwerk - Privat";
-App::$strings["Community Forum"] = "Forum";
-App::$strings["Forum - Mostly Public"] = "Forum - Weitgehend öffentlich";
-App::$strings["Forum - Restricted"] = "Forum - Beschränkt";
-App::$strings["Forum - Private"] = "Forum - Privat";
-App::$strings["Feed Republish"] = "Teilen von Feeds";
-App::$strings["Feed - Mostly Public"] = "Feeds - Weitgehend öffentlich";
-App::$strings["Feed - Restricted"] = "Feeds - Beschränkt";
-App::$strings["Special Purpose"] = "Für besondere Zwecke";
-App::$strings["Special - Celebrity/Soapbox"] = "Speziell - Mitteilungs-Kanal (keine Kommentare)";
-App::$strings["Special - Group Repository"] = "Speziell - Gruppenarchiv";
-App::$strings["Custom/Expert Mode"] = "Benutzerdefiniert/Expertenmodus";
+App::$strings["Image/photo"] = "Bild/Foto";
+App::$strings["Encrypted content"] = "Verschlüsselter Inhalt";
+App::$strings["Install %s element: "] = "Element %s installieren: ";
+App::$strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Dieser Beitrag beinhaltet ein installierbares %s Element, aber Du hast nicht die nötigen Rechte, um es auf diesem Hub zu installieren.";
+App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s schrieb den folgenden %2\$s %3\$s";
+App::$strings["Click to open/close"] = "Klicke zum Öffnen/Schließen";
+App::$strings["spoiler"] = "Spoiler";
+App::$strings["Different viewers will see this text differently"] = "Verschiedene Betrachter werden diesen Text unterschiedlich sehen";
+App::$strings["$1 wrote:"] = "$1 schrieb:";
+App::$strings["%1\$s is now connected with %2\$s"] = "%1\$s ist jetzt mit %2\$s verbunden";
+App::$strings["%1\$s poked %2\$s"] = "%1\$s stupste %2\$s an";
+App::$strings["poked"] = "stupste";
+App::$strings["View %s's profile @ %s"] = "%ss Profil auf %s ansehen";
+App::$strings["Categories:"] = "Kategorien:";
+App::$strings["Filed under:"] = "Gespeichert unter:";
+App::$strings["View in context"] = "Im Zusammenhang anschauen";
+App::$strings["remove"] = "lösche";
+App::$strings["Delete Selected Items"] = "Lösche die ausgewählten Elemente";
+App::$strings["View Source"] = "Quelle anzeigen";
+App::$strings["Follow Thread"] = "Unterhaltung folgen";
+App::$strings["Unfollow Thread"] = "Unterhaltung nicht mehr folgen";
+App::$strings["Activity/Posts"] = "Aktivitäten/Beiträge";
+App::$strings["Edit Connection"] = "Verbindung bearbeiten";
+App::$strings["Message"] = "Nachricht";
+App::$strings["%s likes this."] = "%s gefällt das.";
+App::$strings["%s doesn't like this."] = "%s gefällt das nicht.";
+App::$strings["<span  %1\$s>%2\$d people</span> like this."] = array(
+	0 => "<span  %1\$s>%2\$d Person</span> gefällt das.",
+	1 => "<span  %1\$s>%2\$d Leuten</span> gefällt das.",
+);
+App::$strings["<span  %1\$s>%2\$d people</span> don't like this."] = array(
+	0 => "<span  %1\$s>%2\$d Person</span> gefällt das nicht.",
+	1 => "<span  %1\$s>%2\$d Leuten</span> gefällt das nicht.",
+);
+App::$strings["and"] = "und";
+App::$strings[", and %d other people"] = array(
+	0 => "",
+	1 => ", und %d andere",
+);
+App::$strings["%s like this."] = "%s gefällt das.";
+App::$strings["%s don't like this."] = "%s gefällt das nicht.";
+App::$strings["Set your location"] = "Standort";
+App::$strings["Clear browser location"] = "Browser-Standort löschen";
+App::$strings["Tag term:"] = "Schlagwort:";
+App::$strings["Where are you right now?"] = "Wo bist Du jetzt grade?";
+App::$strings["Page link name"] = "Link zur Seite";
+App::$strings["Post as"] = "Veröffentlichen als";
+App::$strings["Toggle voting"] = "Umfragewerkzeug aktivieren";
+App::$strings["Categories (optional, comma-separated list)"] = "Kategorien (optional, kommagetrennte Liste)";
+App::$strings["Set publish date"] = "Veröffentlichungsdatum festlegen";
+App::$strings["OK"] = "Ok";
+App::$strings["Discover"] = "Entdecken";
+App::$strings["Imported public streams"] = "Importierte öffentliche Beiträge";
+App::$strings["Commented Order"] = "Neueste Kommentare";
+App::$strings["Sort by Comment Date"] = "Nach Kommentardatum sortiert";
+App::$strings["Posted Order"] = "Neueste Beiträge";
+App::$strings["Sort by Post Date"] = "Nach Beitragsdatum sortiert";
+App::$strings["Posts that mention or involve you"] = "Beiträge mit Beteiligung Deinerseits";
+App::$strings["Activity Stream - by date"] = "Activity Stream – nach Datum sortiert";
+App::$strings["Starred"] = "Markiert";
+App::$strings["Favourite Posts"] = "Markierte Beiträge";
+App::$strings["Spam"] = "Spam";
+App::$strings["Posts flagged as SPAM"] = "Nachrichten, die als SPAM markiert wurden";
+App::$strings["Status Messages and Posts"] = "Statusnachrichten und Beiträge";
+App::$strings["About"] = "Ãœber";
+App::$strings["Profile Details"] = "Profil-Details";
+App::$strings["Files and Storage"] = "Dateien und Speicher";
+App::$strings["Saved Bookmarks"] = "Gespeicherte Lesezeichen";
+App::$strings["Manage Webpages"] = "Webseiten verwalten";
+App::$strings["__ctx:noun__ Attending"] = array(
+	0 => "Zusage",
+	1 => "Zusagen",
+);
+App::$strings["__ctx:noun__ Not Attending"] = array(
+	0 => "Absage",
+	1 => "Absagen",
+);
+App::$strings["__ctx:noun__ Undecided"] = array(
+	0 => " Unentschlossen",
+	1 => "Unentschlossene",
+);
+App::$strings["__ctx:noun__ Agree"] = array(
+	0 => "Zustimmung",
+	1 => "Zustimmungen",
+);
+App::$strings["__ctx:noun__ Disagree"] = array(
+	0 => "Ablehnung",
+	1 => "Ablehnungen",
+);
+App::$strings["__ctx:noun__ Abstain"] = array(
+	0 => "Enthaltung",
+	1 => "Enthaltungen",
+);
 App::$strings["prev"] = "vorherige";
 App::$strings["first"] = "erste";
 App::$strings["last"] = "letzte";
@@ -2180,12 +2073,29 @@ App::$strings["depressed"] = "deprimiert";
 App::$strings["motivated"] = "motiviert";
 App::$strings["relaxed"] = "entspannt";
 App::$strings["surprised"] = "überrascht";
+App::$strings["Monday"] = "Montag";
+App::$strings["Tuesday"] = "Dienstag";
+App::$strings["Wednesday"] = "Mittwoch";
+App::$strings["Thursday"] = "Donnerstag";
+App::$strings["Friday"] = "Freitag";
+App::$strings["Saturday"] = "Samstag";
+App::$strings["Sunday"] = "Sonntag";
+App::$strings["January"] = "Januar";
+App::$strings["February"] = "Februar";
+App::$strings["March"] = "März";
+App::$strings["April"] = "April";
 App::$strings["May"] = "Mai";
+App::$strings["June"] = "Juni";
+App::$strings["July"] = "Juli";
+App::$strings["August"] = "August";
+App::$strings["September"] = "September";
+App::$strings["October"] = "Oktober";
+App::$strings["November"] = "November";
+App::$strings["December"] = "Dezember";
 App::$strings["Unknown Attachment"] = "Unbekannter Anhang";
 App::$strings["unknown"] = "unbekannt";
 App::$strings["remove category"] = "Kategorie entfernen";
 App::$strings["remove from file"] = "aus der Datei entfernen";
-App::$strings["Click to open/close"] = "Klicke zum Öffnen/Schließen";
 App::$strings["default"] = "Standard";
 App::$strings["Page layout"] = "Seiten-Layout";
 App::$strings["You can create your own with the layouts tool"] = "Mit dem Gestaltungswerkzeug kannst Du Deine eigenen Layouts erstellen";
@@ -2194,50 +2104,158 @@ App::$strings["Select an alternate language"] = "Wähle eine alternative Sprache
 App::$strings["activity"] = "Aktivität";
 App::$strings["Design Tools"] = "Gestaltungswerkzeuge";
 App::$strings["Pages"] = "Seiten";
-App::$strings["Logout"] = "Abmelden";
-App::$strings["End this session"] = "Beende diese Sitzung";
-App::$strings["Home"] = "Home";
-App::$strings["Your posts and conversations"] = "Deine Beiträge und Unterhaltungen";
-App::$strings["Your profile page"] = "Deine Profilseite";
-App::$strings["Manage/Edit profiles"] = "Profile verwalten";
-App::$strings["Edit your profile"] = "Profil bearbeiten";
-App::$strings["Your photos"] = "Deine Bilder";
-App::$strings["Your files"] = "Deine Dateien";
-App::$strings["Your chatrooms"] = "Deine Chaträume";
-App::$strings["Your bookmarks"] = "Deine Lesezeichen";
-App::$strings["Your webpages"] = "Deine Webseiten";
-App::$strings["Sign in"] = "Anmelden";
-App::$strings["%s - click to logout"] = "%s - Klick zum Abmelden";
-App::$strings["Remote authentication"] = "Ãœber Konto auf anderem Server einloggen";
-App::$strings["Click to authenticate to your home hub"] = "Klicke, um Dich über Deinen Heimat-Server zu authentifizieren";
-App::$strings["Home Page"] = "Homepage";
-App::$strings["Create an account"] = "Erzeuge ein Konto";
-App::$strings["Help and documentation"] = "Hilfe und Dokumentation";
-App::$strings["Applications, utilities, links, games"] = "Anwendungen (Apps), Zubehör, Links, Spiele";
-App::$strings["Search site @name, #tag, ?docs, content"] = "Hub durchsuchen: @Name. #Schlagwort, ?Dokumentation, Inhalt";
-App::$strings["Channel Directory"] = "Kanal-Verzeichnis";
-App::$strings["Your grid"] = "Dein Grid";
-App::$strings["Mark all grid notifications seen"] = "Alle Grid-Benachrichtigungen als angesehen markieren";
-App::$strings["Channel home"] = "Mein Kanal";
-App::$strings["Mark all channel notifications seen"] = "Markiere alle Kanal-Benachrichtigungen als angesehen";
-App::$strings["Notices"] = "Benachrichtigungen";
-App::$strings["Notifications"] = "Benachrichtigungen";
-App::$strings["See all notifications"] = "Alle Benachrichtigungen ansehen";
-App::$strings["Private mail"] = "Persönliche Mail";
-App::$strings["See all private messages"] = "Alle persönlichen Nachrichten ansehen";
-App::$strings["Mark all private messages seen"] = "Markiere alle persönlichen Nachrichten als gesehen";
-App::$strings["Event Calendar"] = "Terminkalender";
-App::$strings["See all events"] = "Alle Termine ansehen";
-App::$strings["Mark all events seen"] = "Markiere alle Termine als gesehen";
-App::$strings["Manage Your Channels"] = "Verwalte Deine Kanäle";
-App::$strings["Account/Channel Settings"] = "Konto-/Kanal-Einstellungen";
-App::$strings["Site Setup and Configuration"] = "Seiten-Einrichtung und -Konfiguration";
-App::$strings["@name, #tag, ?doc, content"] = "@Name, #Schlagwort, ?Dokumentation, Inhalt";
-App::$strings["Please wait..."] = "Bitte warten...";
-App::$strings["Invalid data packet"] = "Ungültiges Datenpaket";
-App::$strings["Unable to verify channel signature"] = "Konnte die Signatur des Kanals nicht verifizieren";
-App::$strings["Unable to verify site signature for %s"] = "Kann die Signatur der Seite von %s nicht verifizieren";
-App::$strings["invalid target signature"] = "Ungültige Signatur des Ziels";
+App::$strings["Not a valid email address"] = "Ungültige E-Mail-Adresse";
+App::$strings["Your email domain is not among those allowed on this site"] = "Deine E-Mail-Adresse ist auf dieser Seite nicht erlaubt";
+App::$strings["Your email address is already registered at this site."] = "Deine E-Mail-Adresse ist auf dieser Seite bereits registriert.";
+App::$strings["An invitation is required."] = "Eine Einladung wird benötigt.";
+App::$strings["Invitation could not be verified."] = "Die Einladung konnte nicht bestätigt werden.";
+App::$strings["Please enter the required information."] = "Bitte gib die benötigten Informationen ein.";
+App::$strings["Failed to store account information."] = "Speichern der Nutzerkontodaten fehlgeschlagen.";
+App::$strings["Registration confirmation for %s"] = "Registrierungsbestätigung für %s";
+App::$strings["Registration request at %s"] = "Registrierungsanfrage auf %s";
+App::$strings["your registration password"] = "Dein Registrierungspasswort";
+App::$strings["Registration details for %s"] = "Registrierungsdetails für %s";
+App::$strings["Account approved."] = "Nutzerkonto bestätigt.";
+App::$strings["Registration revoked for %s"] = "Registrierung für %s wurde widerrufen";
+App::$strings["Account verified. Please login."] = "Nutzerkonto wurde bestätigt. Bitte melde Dich an!";
+App::$strings["Click here to upgrade."] = "Klicke hier, um das Upgrade durchzuführen.";
+App::$strings["This action exceeds the limits set by your subscription plan."] = "Diese Aktion überschreitet die Grenzen Ihres Abonnements.";
+App::$strings["This action is not available under your subscription plan."] = "Diese Aktion ist in Ihrem Abonnement nicht verfügbar.";
+App::$strings["Tags"] = "Schlagwörter";
+App::$strings["Keywords"] = "Schlüsselwörter";
+App::$strings["have"] = "habe";
+App::$strings["has"] = "hat";
+App::$strings["want"] = "will";
+App::$strings["wants"] = "will";
+App::$strings["likes"] = "gefällt";
+App::$strings["dislikes"] = "missfällt";
+App::$strings["Only me"] = "Nur ich";
+App::$strings["Public"] = "Öffentlich";
+App::$strings["Anybody in the \$Projectname network"] = "Jeder innerhalb des \$Projectname Netzwerks";
+App::$strings["Any account on %s"] = "Jedes Nutzerkonto auf %s";
+App::$strings["Any of my connections"] = "Alle meine Verbindungen";
+App::$strings["Only me (only specified contacts and me)"] = "Nur ich (nur ausgewählte Kontakte und ich)";
+App::$strings["Anybody authenticated (could include visitors from other networks)"] = "Jeder, der angemeldet ist (kann Besucher anderer Netzwerke beinhalten)";
+App::$strings["Any connections including those who haven't yet been approved"] = "Alle Verbindungen einschließlich der noch nicht bestätigten";
+App::$strings["This is your default setting for the audience of your normal stream, and posts."] = "Dies ist Deine Voreinstellung für die Sichtbarkeit Deiner normalen Beiträge (Stream).";
+App::$strings["This is your default setting for who can view your default channel profile"] = "Dies ist Deine Voreinstellung für die Sichtbarkeit Deines Standard-Kanalprofils.";
+App::$strings["This is your default setting for who can view your connections"] = "Dies ist Deine Voreinstellung für die Sichtbarkeit Deiner Verbindungen.";
+App::$strings["This is your default setting for who can view your file storage and photos"] = "Dies ist Deine Voreinstellung für die Sichtbarkeit Deiner Dateien und Fotos.";
+App::$strings["This is your default setting for the audience of your webpages"] = "Dies ist Deine Voreinstellung für die Sichtbarkeit Deiner Webseiten.";
+App::$strings["Delete this item?"] = "Dieses Element löschen?";
+App::$strings["[-] show less"] = "[-] Weniger anzeigen";
+App::$strings["[+] expand"] = "[+] aufklappen";
+App::$strings["[-] collapse"] = "[-] einklappen";
+App::$strings["Password too short"] = "Kennwort zu kurz";
+App::$strings["Passwords do not match"] = "Kennwörter stimmen nicht überein";
+App::$strings["everybody"] = "alle";
+App::$strings["Secret Passphrase"] = "geheime Passphrase";
+App::$strings["Passphrase hint"] = "Hinweis zur Passphrase";
+App::$strings["Notice: Permissions have changed but have not yet been submitted."] = "Achtung: Berechtigungen wurden verändert, aber noch nicht gespeichert.";
+App::$strings["close all"] = "Alle schließen";
+App::$strings["Nothing new here"] = "Nichts Neues hier";
+App::$strings["Rate This Channel (this is public)"] = "Diesen Kanal bewerten (öffentlich sichtbar)";
+App::$strings["Describe (optional)"] = "Beschreibung (optional)";
+App::$strings["Please enter a link URL"] = "Gib eine URL ein:";
+App::$strings["Unsaved changes. Are you sure you wish to leave this page?"] = "Ungespeicherte Änderungen. Bist Du sicher, dass Du diese Seite verlassen möchtest?";
+App::$strings["timeago.prefixAgo"] = "timeago.prefixAgo";
+App::$strings["timeago.prefixFromNow"] = " ";
+App::$strings["ago"] = "her";
+App::$strings["from now"] = "von jetzt";
+App::$strings["less than a minute"] = "weniger als eine Minute";
+App::$strings["about a minute"] = "ungefähr eine Minute";
+App::$strings["%d minutes"] = "%d Minuten";
+App::$strings["about an hour"] = "ungefähr eine Stunde";
+App::$strings["about %d hours"] = "ungefähr %d Stunden";
+App::$strings["a day"] = "ein Tag";
+App::$strings["%d days"] = "%d Tage";
+App::$strings["about a month"] = "ungefähr ein Monat";
+App::$strings["%d months"] = "%d Monate";
+App::$strings["about a year"] = "ungefähr ein Jahr";
+App::$strings["%d years"] = "%d Jahre";
+App::$strings[" "] = " ";
+App::$strings["timeago.numbers"] = "timeago.numbers";
+App::$strings["__ctx:long__ May"] = "Mai";
+App::$strings["Jan"] = "Jan";
+App::$strings["Feb"] = "Feb";
+App::$strings["Mar"] = "Mär";
+App::$strings["Apr"] = "Apr";
+App::$strings["__ctx:short__ May"] = "Mai";
+App::$strings["Jun"] = "Jun";
+App::$strings["Jul"] = "Jul";
+App::$strings["Aug"] = "Aug";
+App::$strings["Sep"] = "Sep";
+App::$strings["Oct"] = "Okt";
+App::$strings["Nov"] = "Nov";
+App::$strings["Dec"] = "Dez";
+App::$strings["Sun"] = "So";
+App::$strings["Mon"] = "Mo";
+App::$strings["Tue"] = "Di";
+App::$strings["Wed"] = "Mi";
+App::$strings["Thu"] = "Do";
+App::$strings["Fri"] = "Fr";
+App::$strings["Sat"] = "Sa";
+App::$strings["__ctx:calendar__ today"] = "heute";
+App::$strings["__ctx:calendar__ month"] = "Monat";
+App::$strings["__ctx:calendar__ week"] = "Woche";
+App::$strings["__ctx:calendar__ day"] = "Tag";
+App::$strings["__ctx:calendar__ All day"] = "Ganztägig";
+App::$strings["No recipient provided."] = "Kein Empfänger angegeben";
+App::$strings["[no subject]"] = "[no subject]";
+App::$strings["Unable to determine sender."] = "Kann Absender nicht bestimmen.";
+App::$strings["Stored post could not be verified."] = "Gespeicherter Beitrag konnten nicht überprüft werden.";
+App::$strings["Public Timeline"] = "Öffentliche Zeitleiste";
+App::$strings["New Page"] = "Neue Seite";
+App::$strings["Title"] = "Titel";
+App::$strings["Can view my normal stream and posts"] = "Kann meine normalen Beiträge sehen";
+App::$strings["Can view my default channel profile"] = "Kann mein Standardprofil sehen";
+App::$strings["Can view my connections"] = "Kann meine Verbindungen sehen";
+App::$strings["Can view my file storage and photos"] = "Kann meine Datei- und Bilderordner sehen";
+App::$strings["Can view my webpages"] = "Kann meine Webseiten sehen";
+App::$strings["Can send me their channel stream and posts"] = "Kann mir die Beiträge aus seinem/ihrem Kanal schicken";
+App::$strings["Can post on my channel page (\"wall\")"] = "Kann auf meiner Kanal-Seite (\"wall\") Beiträge veröffentlichen";
+App::$strings["Can comment on or like my posts"] = "Darf meine Beiträge kommentieren und mögen/nicht mögen";
+App::$strings["Can send me private mail messages"] = "Kann mir private Nachrichten schicken";
+App::$strings["Can like/dislike stuff"] = "Kann andere Elemente mögen/nicht mögen";
+App::$strings["Profiles and things other than posts/comments"] = "Profile und alles außer Beiträge und Kommentare";
+App::$strings["Can forward to all my channel contacts via post @mentions"] = "Kann an alle meine Kontakte via @-Erwähnung Nachrichten weiterleiten";
+App::$strings["Advanced - useful for creating group forum channels"] = "Fortgeschritten - sinnvoll, um Gruppen-Kanäle/-Foren zu erstellen";
+App::$strings["Can chat with me (when available)"] = "Kann mit mir chatten (wenn verfügbar)";
+App::$strings["Can write to my file storage and photos"] = "Kann in meine Datei- und Bilderordner schreiben";
+App::$strings["Can edit my webpages"] = "Kann meine Webseiten bearbeiten";
+App::$strings["Can source my public posts in derived channels"] = "Kann meine öffentlichen Beiträge als Quellen für Kanäle verwenden";
+App::$strings["Somewhat advanced - very useful in open communities"] = "Etwas fortgeschritten – sehr nützlich in offenen Gemeinschaften";
+App::$strings["Can administer my channel resources"] = "Kann meine Kanäle administrieren";
+App::$strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Sehr fortgeschritten. Bearbeite das nur, wenn Du genau weißt, was Du tust";
+App::$strings["Social Networking"] = "Soziales Netzwerk";
+App::$strings["Social - Mostly Public"] = "Soziales Netzwerk - Weitgehend öffentlich";
+App::$strings["Social - Restricted"] = "Soziales Netzwerk - Beschränkt";
+App::$strings["Social - Private"] = "Soziales Netzwerk - Privat";
+App::$strings["Community Forum"] = "Forum";
+App::$strings["Forum - Mostly Public"] = "Forum - Weitgehend öffentlich";
+App::$strings["Forum - Restricted"] = "Forum - Beschränkt";
+App::$strings["Forum - Private"] = "Forum - Privat";
+App::$strings["Feed Republish"] = "Teilen von Feeds";
+App::$strings["Feed - Mostly Public"] = "Feeds - Weitgehend öffentlich";
+App::$strings["Feed - Restricted"] = "Feeds - Beschränkt";
+App::$strings["Special Purpose"] = "Für besondere Zwecke";
+App::$strings["Special - Celebrity/Soapbox"] = "Speziell - Mitteilungs-Kanal (keine Kommentare)";
+App::$strings["Special - Group Repository"] = "Speziell - Gruppenarchiv";
+App::$strings["Custom/Expert Mode"] = "Benutzerdefiniert/Expertenmodus";
+App::$strings["Site Admin"] = "Hub-Administration";
+App::$strings["Bug Report"] = "Fehler-Rückmeldung";
+App::$strings["View Bookmarks"] = "Lesezeichen ansehen";
+App::$strings["My Chatrooms"] = "Meine Chaträume";
+App::$strings["Firefox Share"] = "Teilen-Knopf für Firefox";
+App::$strings["Remote Diagnostics"] = "Ferndiagnose";
+App::$strings["Probe"] = "Testen";
+App::$strings["Suggest"] = "Empfehlen";
+App::$strings["Random Channel"] = "Zufälliger Kanal";
+App::$strings["Invite"] = "Einladen";
+App::$strings["Post"] = "Beitrag schreiben";
+App::$strings["Purchase"] = "Kaufen";
+App::$strings["Attachments:"] = "Anhänge:";
+App::$strings["\$Projectname event notification:"] = "\$Projectname-Terminbenachrichtigung:";
 App::$strings["Focus (Hubzilla default)"] = "Focus (Voreinstellung für Hubzilla)";
 App::$strings["Theme settings"] = "Theme-Einstellungen";
 App::$strings["Select scheme"] = "Schema wählen";
diff --git a/view/es-es/hmessages.po b/view/es-es/hmessages.po
index a77386393..8852239f5 100644
--- a/view/es-es/hmessages.po
+++ b/view/es-es/hmessages.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Alfonso <alfonsomthd@tutanota.com>, 2015
-# JACOB MALDONADO <axetransit@gmail.com>, 2015
+# inboxwall <axetransit@gmail.com>, 2015
 # jeroenpraat <jeroenpraat@xs4all.nl>, 2015
 # Manuel Jiménez Friaza <mjfriaza@openmailbox.org>, 2015-2016
 # Rafael, 2015
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Redmatrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-29 00:01-0700\n"
-"PO-Revision-Date: 2016-04-30 09:57+0000\n"
+"POT-Creation-Date: 2016-05-13 00:02-0700\n"
+"PO-Revision-Date: 2016-05-13 16:14+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:2606
+#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2632
 msgid "Collection"
 msgstr "Colección"
 
@@ -51,16 +51,16 @@ msgstr "Programar bandeja de entrada"
 msgid "Schedule Outbox"
 msgstr "Programar bandeja de salida"
 
-#: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Module/Photos.php:797
-#: ../../Zotlabs/Module/Photos.php:1242 ../../include/apps.php:360
-#: ../../include/apps.php:415 ../../include/conversation.php:1037
-#: ../../include/widgets.php:1457
+#: ../../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
 msgid "Unknown"
 msgstr "Desconocido"
 
 #: ../../Zotlabs/Storage/Browser.php:226 ../../Zotlabs/Module/Fbrowser.php:85
-#: ../../include/apps.php:135 ../../include/conversation.php:1657
-#: ../../include/nav.php:93
+#: ../../include/nav.php:93 ../../include/conversation.php:1645
+#: ../../include/apps.php:167
 msgid "Files"
 msgstr "Ficheros"
 
@@ -73,22 +73,22 @@ msgid "Shared"
 msgstr "Compartido"
 
 #: ../../Zotlabs/Storage/Browser.php:230 ../../Zotlabs/Storage/Browser.php:303
-#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Layouts.php:180
+#: ../../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:188
+#: ../../Zotlabs/Module/Webpages.php:186
 msgid "Create"
 msgstr "Crear"
 
 #: ../../Zotlabs/Storage/Browser.php:231 ../../Zotlabs/Storage/Browser.php:305
 #: ../../Zotlabs/Module/Cover_photo.php:357
-#: ../../Zotlabs/Module/Photos.php:824 ../../Zotlabs/Module/Photos.php:1366
-#: ../../Zotlabs/Module/Profile_photo.php:368 ../../include/widgets.php:1470
+#: ../../Zotlabs/Module/Photos.php:825 ../../Zotlabs/Module/Photos.php:1367
+#: ../../Zotlabs/Module/Profile_photo.php:368 ../../include/widgets.php:1519
 msgid "Upload"
 msgstr "Subir"
 
-#: ../../Zotlabs/Storage/Browser.php:235 ../../Zotlabs/Module/Admin.php:1166
-#: ../../Zotlabs/Module/Chat.php:245 ../../Zotlabs/Module/Settings.php:590
-#: ../../Zotlabs/Module/Settings.php:616
+#: ../../Zotlabs/Storage/Browser.php:235 ../../Zotlabs/Module/Admin.php:1208
+#: ../../Zotlabs/Module/Chat.php:245 ../../Zotlabs/Module/Settings.php:592
+#: ../../Zotlabs/Module/Settings.php:618
 #: ../../Zotlabs/Module/Sharedwithme.php:99
 msgid "Name"
 msgstr "Nombre"
@@ -98,7 +98,7 @@ msgid "Type"
 msgstr "Tipo"
 
 #: ../../Zotlabs/Storage/Browser.php:237
-#: ../../Zotlabs/Module/Sharedwithme.php:101 ../../include/text.php:1293
+#: ../../Zotlabs/Module/Sharedwithme.php:101 ../../include/text.php:1322
 msgid "Size"
 msgstr "Tamaño"
 
@@ -107,35 +107,35 @@ msgstr "Tamaño"
 msgid "Last Modified"
 msgstr "Última modificación"
 
-#: ../../Zotlabs/Storage/Browser.php:240 ../../Zotlabs/Module/Admin.php:1775
-#: ../../Zotlabs/Module/Blocks.php:159
+#: ../../Zotlabs/Storage/Browser.php:240 ../../Zotlabs/Module/Admin.php:2075
+#: ../../Zotlabs/Module/Blocks.php:157
 #: ../../Zotlabs/Module/Connections.php:290
 #: ../../Zotlabs/Module/Connections.php:310
-#: ../../Zotlabs/Module/Editblock.php:140
-#: ../../Zotlabs/Module/Editlayout.php:139
-#: ../../Zotlabs/Module/Editpost.php:118
-#: ../../Zotlabs/Module/Editwebpage.php:181
-#: ../../Zotlabs/Module/Layouts.php:188 ../../Zotlabs/Module/Menu.php:112
-#: ../../Zotlabs/Module/Settings.php:650 ../../Zotlabs/Module/Thing.php:260
-#: ../../Zotlabs/Module/Webpages.php:189 ../../include/identity.php:930
-#: ../../include/identity.php:934 ../../include/ItemObject.php:100
-#: ../../include/apps.php:259 ../../include/menu.php:108
-#: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36
+#: ../../Zotlabs/Module/Editblock.php:109
+#: ../../Zotlabs/Module/Editlayout.php:113
+#: ../../Zotlabs/Module/Editpost.php:84
+#: ../../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
 msgid "Edit"
 msgstr "Editar"
 
-#: ../../Zotlabs/Storage/Browser.php:241 ../../Zotlabs/Module/Admin.php:1001
-#: ../../Zotlabs/Module/Admin.php:1160 ../../Zotlabs/Module/Admin.php:1776
-#: ../../Zotlabs/Module/Blocks.php:161
+#: ../../Zotlabs/Storage/Browser.php:241 ../../Zotlabs/Module/Admin.php:1043
+#: ../../Zotlabs/Module/Admin.php:1202 ../../Zotlabs/Module/Admin.php:2076
+#: ../../Zotlabs/Module/Blocks.php:159
 #: ../../Zotlabs/Module/Connections.php:263
 #: ../../Zotlabs/Module/Connedit.php:573
-#: ../../Zotlabs/Module/Editblock.php:180
-#: ../../Zotlabs/Module/Editlayout.php:184
-#: ../../Zotlabs/Module/Editwebpage.php:221 ../../Zotlabs/Module/Group.php:177
-#: ../../Zotlabs/Module/Photos.php:1172 ../../Zotlabs/Module/Settings.php:651
-#: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Module/Webpages.php:191
-#: ../../include/ItemObject.php:120 ../../include/apps.php:260
-#: ../../include/conversation.php:657
+#: ../../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
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -163,42 +163,42 @@ 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:70 ../../Zotlabs/Module/Authtest.php:16
+#: ../../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:104
-#: ../../Zotlabs/Module/Channel.php:224 ../../Zotlabs/Module/Channel.php:264
+#: ../../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/Module/Connedit.php:366
 #: ../../Zotlabs/Module/Cover_photo.php:277
 #: ../../Zotlabs/Module/Cover_photo.php:290
-#: ../../Zotlabs/Module/Editblock.php:69
+#: ../../Zotlabs/Module/Editblock.php:67
 #: ../../Zotlabs/Module/Editlayout.php:67
-#: ../../Zotlabs/Module/Editlayout.php:91 ../../Zotlabs/Module/Editpost.php:17
-#: ../../Zotlabs/Module/Editwebpage.php:68
+#: ../../Zotlabs/Module/Editlayout.php:90 ../../Zotlabs/Module/Editpost.php:17
+#: ../../Zotlabs/Module/Editwebpage.php:69
 #: ../../Zotlabs/Module/Editwebpage.php:90
 #: ../../Zotlabs/Module/Editwebpage.php:105
-#: ../../Zotlabs/Module/Editwebpage.php:129
-#: ../../Zotlabs/Module/Events.php:264 ../../Zotlabs/Module/Filestorage.php:22
-#: ../../Zotlabs/Module/Filestorage.php:77
-#: ../../Zotlabs/Module/Filestorage.php:92
-#: ../../Zotlabs/Module/Filestorage.php:119
+#: ../../Zotlabs/Module/Editwebpage.php:127
+#: ../../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/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:73 ../../Zotlabs/Module/Layouts.php:80
-#: ../../Zotlabs/Module/Layouts.php:91 ../../Zotlabs/Module/Like.php:181
+#: ../../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/Manage.php:10 ../../Zotlabs/Module/Menu.php:78
 #: ../../Zotlabs/Module/Message.php:20 ../../Zotlabs/Module/Mitem.php:115
-#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Network.php:16
+#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Network.php:17
 #: ../../Zotlabs/Module/New_channel.php:77
 #: ../../Zotlabs/Module/New_channel.php:104
 #: ../../Zotlabs/Module/Notifications.php:70 ../../Zotlabs/Module/Page.php:35
 #: ../../Zotlabs/Module/Page.php:90 ../../Zotlabs/Module/Pdledit.php:26
-#: ../../Zotlabs/Module/Photos.php:74 ../../Zotlabs/Module/Poke.php:137
+#: ../../Zotlabs/Module/Photos.php:75 ../../Zotlabs/Module/Poke.php:137
 #: ../../Zotlabs/Module/Profile.php:68 ../../Zotlabs/Module/Profile.php:76
 #: ../../Zotlabs/Module/Profile_photo.php:256
 #: ../../Zotlabs/Module/Profile_photo.php:269
@@ -206,22 +206,22 @@ msgstr "Subir fichero"
 #: ../../Zotlabs/Module/Rate.php:115 ../../Zotlabs/Module/Register.php:77
 #: ../../Zotlabs/Module/Regmod.php:21
 #: ../../Zotlabs/Module/Service_limits.php:11
-#: ../../Zotlabs/Module/Settings.php:570 ../../Zotlabs/Module/Setup.php:238
+#: ../../Zotlabs/Module/Settings.php:572 ../../Zotlabs/Module/Setup.php:238
 #: ../../Zotlabs/Module/Sharedwithme.php:11
-#: ../../Zotlabs/Module/Sources.php:70 ../../Zotlabs/Module/Suggest.php:30
+#: ../../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/Viewsrc.php:18 ../../Zotlabs/Module/Webpages.php:73
-#: ../../include/chat.php:133 ../../include/attach.php:141
+#: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Webpages.php:74
+#: ../../include/photos.php:29 ../../include/chat.php:133
+#: ../../include/items.php:3439 ../../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:4671
-#: ../../include/photos.php:29 ../../index.php:174
+#: ../../include/attach.php:1118 ../../index.php:174
 msgid "Permission denied."
 msgstr "Acceso denegado."
 
@@ -248,12 +248,12 @@ msgid "Welcome %s. Remote authentication successful."
 msgstr "Bienvenido %s. La identificación desde su servidor se ha llevado a cabo correctamente."
 
 #: ../../Zotlabs/Module/Achievements.php:15 ../../Zotlabs/Module/Blocks.php:33
-#: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Editblock.php:33
+#: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Editblock.php:31
 #: ../../Zotlabs/Module/Editlayout.php:31
-#: ../../Zotlabs/Module/Editwebpage.php:32
-#: ../../Zotlabs/Module/Filestorage.php:58 ../../Zotlabs/Module/Hcard.php:12
-#: ../../Zotlabs/Module/Layouts.php:33 ../../Zotlabs/Module/Profile.php:20
-#: ../../Zotlabs/Module/Webpages.php:33 ../../include/identity.php:830
+#: ../../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
 msgid "Requested profile is not available."
 msgstr "El perfil solicitado no está disponible."
 
@@ -269,1026 +269,1128 @@ msgstr "red"
 msgid "RSS"
 msgstr "RSS"
 
-#: ../../Zotlabs/Module/Admin.php:58
+#: ../../Zotlabs/Module/Admin.php:77
 msgid "Theme settings updated."
 msgstr "Ajustes del tema actualizados."
 
-#: ../../Zotlabs/Module/Admin.php:145 ../../Zotlabs/Module/Admin.php:1197
-#: ../../Zotlabs/Module/Admin.php:1442 ../../Zotlabs/Module/Display.php:44
-#: ../../Zotlabs/Module/Filestorage.php:31 ../../Zotlabs/Module/Thing.php:89
-#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:4592
+#: ../../Zotlabs/Module/Admin.php:164 ../../Zotlabs/Module/Admin.php:1239
+#: ../../Zotlabs/Module/Admin.php:1541 ../../Zotlabs/Module/Display.php:44
+#: ../../Zotlabs/Module/Filestorage.php:33 ../../Zotlabs/Module/Thing.php:89
+#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:3360
 msgid "Item not found."
 msgstr "Elemento no encontrado."
 
-#: ../../Zotlabs/Module/Admin.php:178
+#: ../../Zotlabs/Module/Admin.php:197
 msgid "# Accounts"
 msgstr "# Cuentas"
 
-#: ../../Zotlabs/Module/Admin.php:179
+#: ../../Zotlabs/Module/Admin.php:198
 msgid "# blocked accounts"
 msgstr "# cuentas bloqueadas"
 
-#: ../../Zotlabs/Module/Admin.php:180
+#: ../../Zotlabs/Module/Admin.php:199
 msgid "# expired accounts"
 msgstr "# cuentas caducadas"
 
-#: ../../Zotlabs/Module/Admin.php:181
+#: ../../Zotlabs/Module/Admin.php:200
 msgid "# expiring accounts"
 msgstr "# cuentas que caducan"
 
-#: ../../Zotlabs/Module/Admin.php:192
+#: ../../Zotlabs/Module/Admin.php:211
 msgid "# Channels"
 msgstr "# Canales"
 
-#: ../../Zotlabs/Module/Admin.php:193
+#: ../../Zotlabs/Module/Admin.php:212
 msgid "# primary"
 msgstr "# primario"
 
-#: ../../Zotlabs/Module/Admin.php:194
+#: ../../Zotlabs/Module/Admin.php:213
 msgid "# clones"
 msgstr "# clones"
 
-#: ../../Zotlabs/Module/Admin.php:200
+#: ../../Zotlabs/Module/Admin.php:219
 msgid "Message queues"
 msgstr "Mensajes en cola"
 
-#: ../../Zotlabs/Module/Admin.php:216 ../../Zotlabs/Module/Admin.php:462
-#: ../../Zotlabs/Module/Admin.php:677 ../../Zotlabs/Module/Admin.php:717
-#: ../../Zotlabs/Module/Admin.php:992 ../../Zotlabs/Module/Admin.php:1156
-#: ../../Zotlabs/Module/Admin.php:1271 ../../Zotlabs/Module/Admin.php:1332
-#: ../../Zotlabs/Module/Admin.php:1493 ../../Zotlabs/Module/Admin.php:1527
-#: ../../Zotlabs/Module/Admin.php:1612
+#: ../../Zotlabs/Module/Admin.php:236
+msgid "Your software should be updated"
+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:1592 ../../Zotlabs/Module/Admin.php:1626
+#: ../../Zotlabs/Module/Admin.php:1711
 msgid "Administration"
 msgstr "Administración"
 
-#: ../../Zotlabs/Module/Admin.php:217
+#: ../../Zotlabs/Module/Admin.php:242
 msgid "Summary"
 msgstr "Sumario"
 
-#: ../../Zotlabs/Module/Admin.php:220
+#: ../../Zotlabs/Module/Admin.php:245
 msgid "Registered accounts"
 msgstr "Cuentas registradas"
 
-#: ../../Zotlabs/Module/Admin.php:221 ../../Zotlabs/Module/Admin.php:681
+#: ../../Zotlabs/Module/Admin.php:246 ../../Zotlabs/Module/Admin.php:715
 msgid "Pending registrations"
 msgstr "Registros pendientes"
 
-#: ../../Zotlabs/Module/Admin.php:222
+#: ../../Zotlabs/Module/Admin.php:247
 msgid "Registered channels"
 msgstr "Canales registrados"
 
-#: ../../Zotlabs/Module/Admin.php:223 ../../Zotlabs/Module/Admin.php:682
+#: ../../Zotlabs/Module/Admin.php:248 ../../Zotlabs/Module/Admin.php:716
 msgid "Active plugins"
-msgstr "Extensiones activas"
+msgstr "Extensiones (plugins) activas"
 
-#: ../../Zotlabs/Module/Admin.php:224
+#: ../../Zotlabs/Module/Admin.php:249
 msgid "Version"
 msgstr "Versión"
 
-#: ../../Zotlabs/Module/Admin.php:345
+#: ../../Zotlabs/Module/Admin.php:250
+msgid "Repository version (master)"
+msgstr "Versión del repositorio (master)"
+
+#: ../../Zotlabs/Module/Admin.php:251
+msgid "Repository version (dev)"
+msgstr "Versión del repositorio (dev)"
+
+#: ../../Zotlabs/Module/Admin.php:373
 msgid "Site settings updated."
 msgstr "Ajustes del sitio actualizados."
 
-#: ../../Zotlabs/Module/Admin.php:372 ../../include/comanche.php:34
+#: ../../Zotlabs/Module/Admin.php:400 ../../include/text.php:2853
 msgid "Default"
 msgstr "Predeterminado"
 
-#: ../../Zotlabs/Module/Admin.php:382 ../../Zotlabs/Module/Settings.php:796
+#: ../../Zotlabs/Module/Admin.php:410 ../../Zotlabs/Module/Settings.php:798
 msgid "mobile"
 msgstr "móvil"
 
-#: ../../Zotlabs/Module/Admin.php:384
+#: ../../Zotlabs/Module/Admin.php:412
 msgid "experimental"
 msgstr "experimental"
 
-#: ../../Zotlabs/Module/Admin.php:386
+#: ../../Zotlabs/Module/Admin.php:414
 msgid "unsupported"
 msgstr "no soportado"
 
-#: ../../Zotlabs/Module/Admin.php:431 ../../Zotlabs/Module/Api.php:89
+#: ../../Zotlabs/Module/Admin.php:459 ../../Zotlabs/Module/Api.php:89
 #: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Connedit.php:657
-#: ../../Zotlabs/Module/Events.php:458 ../../Zotlabs/Module/Events.php:459
-#: ../../Zotlabs/Module/Events.php:468
-#: ../../Zotlabs/Module/Filestorage.php:155
-#: ../../Zotlabs/Module/Filestorage.php:163 ../../Zotlabs/Module/Menu.php:100
+#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:460
+#: ../../Zotlabs/Module/Events.php:469
+#: ../../Zotlabs/Module/Filestorage.php:157
+#: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Menu.php:100
 #: ../../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:665
+#: ../../Zotlabs/Module/Mitem.php:233 ../../Zotlabs/Module/Photos.php:666
 #: ../../Zotlabs/Module/Profiles.php:651 ../../Zotlabs/Module/Removeme.php:64
-#: ../../Zotlabs/Module/Settings.php:579 ../../include/dir_fns.php:141
+#: ../../Zotlabs/Module/Settings.php:581 ../../include/dir_fns.php:141
 #: ../../include/dir_fns.php:142 ../../include/dir_fns.php:143
 #: ../../view/theme/redbasic/php/config.php:105
 #: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1619
 msgid "No"
 msgstr "No"
 
-#: ../../Zotlabs/Module/Admin.php:432
+#: ../../Zotlabs/Module/Admin.php:460
 msgid "Yes - with approval"
 msgstr "Sí - con aprobación"
 
-#: ../../Zotlabs/Module/Admin.php:433 ../../Zotlabs/Module/Api.php:88
-#: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Events.php:458
-#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:468
-#: ../../Zotlabs/Module/Filestorage.php:155
-#: ../../Zotlabs/Module/Filestorage.php:163 ../../Zotlabs/Module/Menu.php:100
+#: ../../Zotlabs/Module/Admin.php:461 ../../Zotlabs/Module/Api.php:88
+#: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Events.php:459
+#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:469
+#: ../../Zotlabs/Module/Filestorage.php:157
+#: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Menu.php:100
 #: ../../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:665
+#: ../../Zotlabs/Module/Mitem.php:233 ../../Zotlabs/Module/Photos.php:666
 #: ../../Zotlabs/Module/Profiles.php:651 ../../Zotlabs/Module/Removeme.php:64
-#: ../../Zotlabs/Module/Settings.php:579 ../../include/dir_fns.php:141
+#: ../../Zotlabs/Module/Settings.php:581 ../../include/dir_fns.php:141
 #: ../../include/dir_fns.php:142 ../../include/dir_fns.php:143
 #: ../../view/theme/redbasic/php/config.php:105
 #: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1619
 msgid "Yes"
 msgstr "Sí"
 
-#: ../../Zotlabs/Module/Admin.php:438
+#: ../../Zotlabs/Module/Admin.php:466
 msgid "My site is not a public server"
 msgstr "Mi sitio no es un servidor público"
 
-#: ../../Zotlabs/Module/Admin.php:439
+#: ../../Zotlabs/Module/Admin.php:467
 msgid "My site has paid access only"
 msgstr "Mi sitio es un servicio de pago"
 
-#: ../../Zotlabs/Module/Admin.php:440
+#: ../../Zotlabs/Module/Admin.php:468
 msgid "My site has free access only"
 msgstr "Mi sitio es un servicio gratuito"
 
-#: ../../Zotlabs/Module/Admin.php:441
+#: ../../Zotlabs/Module/Admin.php:469
 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:463 ../../include/widgets.php:1334
+#: ../../Zotlabs/Module/Admin.php:491 ../../include/widgets.php:1383
 msgid "Site"
 msgstr "Sitio"
 
-#: ../../Zotlabs/Module/Admin.php:464 ../../Zotlabs/Module/Admin.php:654
-#: ../../Zotlabs/Module/Admin.php:729 ../../Zotlabs/Module/Admin.php:994
-#: ../../Zotlabs/Module/Admin.php:1158 ../../Zotlabs/Module/Admin.php:1334
-#: ../../Zotlabs/Module/Admin.php:1529 ../../Zotlabs/Module/Admin.php:1614
-#: ../../Zotlabs/Module/Admin.php:1778 ../../Zotlabs/Module/Appman.php:103
+#: ../../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:1628 ../../Zotlabs/Module/Admin.php:1713
+#: ../../Zotlabs/Module/Admin.php:2078 ../../Zotlabs/Module/Appman.php:125
 #: ../../Zotlabs/Module/Cal.php:341 ../../Zotlabs/Module/Chat.php:194
 #: ../../Zotlabs/Module/Chat.php:236 ../../Zotlabs/Module/Connect.php:97
-#: ../../Zotlabs/Module/Connedit.php:734 ../../Zotlabs/Module/Events.php:472
-#: ../../Zotlabs/Module/Events.php:669
-#: ../../Zotlabs/Module/Filestorage.php:160
+#: ../../Zotlabs/Module/Connedit.php:734 ../../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/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/Mood.php:139 ../../Zotlabs/Module/Pconfig.php:107
-#: ../../Zotlabs/Module/Pdledit.php:66 ../../Zotlabs/Module/Photos.php:676
-#: ../../Zotlabs/Module/Photos.php:1051 ../../Zotlabs/Module/Photos.php:1091
-#: ../../Zotlabs/Module/Photos.php:1209 ../../Zotlabs/Module/Poke.php:186
+#: ../../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:172
-#: ../../Zotlabs/Module/Settings.php:588 ../../Zotlabs/Module/Settings.php:701
-#: ../../Zotlabs/Module/Settings.php:729 ../../Zotlabs/Module/Settings.php:752
-#: ../../Zotlabs/Module/Settings.php:840
-#: ../../Zotlabs/Module/Settings.php:1032 ../../Zotlabs/Module/Setup.php:335
-#: ../../Zotlabs/Module/Setup.php:376 ../../Zotlabs/Module/Sources.php:108
-#: ../../Zotlabs/Module/Sources.php:142 ../../Zotlabs/Module/Thing.php:316
+#: ../../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/Sources.php:149 ../../Zotlabs/Module/Thing.php:316
 #: ../../Zotlabs/Module/Thing.php:362 ../../Zotlabs/Module/Xchan.php:15
-#: ../../include/ItemObject.php:703 ../../include/widgets.php:708
-#: ../../include/widgets.php:720 ../../include/js_strings.php:22
+#: ../../include/widgets.php:757 ../../include/widgets.php:769
+#: ../../include/ItemObject.php:703 ../../include/js_strings.php:22
 #: ../../view/theme/redbasic/php/config.php:99
 msgid "Submit"
 msgstr "Enviar"
 
-#: ../../Zotlabs/Module/Admin.php:465 ../../Zotlabs/Module/Register.php:245
+#: ../../Zotlabs/Module/Admin.php:493 ../../Zotlabs/Module/Register.php:245
 msgid "Registration"
 msgstr "Registro"
 
-#: ../../Zotlabs/Module/Admin.php:466
+#: ../../Zotlabs/Module/Admin.php:494
 msgid "File upload"
 msgstr "Subir fichero"
 
-#: ../../Zotlabs/Module/Admin.php:467
+#: ../../Zotlabs/Module/Admin.php:495
 msgid "Policies"
 msgstr "Políticas"
 
-#: ../../Zotlabs/Module/Admin.php:468 ../../include/contact_widgets.php:19
+#: ../../Zotlabs/Module/Admin.php:496 ../../include/contact_widgets.php:19
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: ../../Zotlabs/Module/Admin.php:472
+#: ../../Zotlabs/Module/Admin.php:500
 msgid "Site name"
 msgstr "Nombre del sitio"
 
-#: ../../Zotlabs/Module/Admin.php:473
+#: ../../Zotlabs/Module/Admin.php:501
 msgid "Banner/Logo"
 msgstr "Banner/Logo"
 
-#: ../../Zotlabs/Module/Admin.php:474
+#: ../../Zotlabs/Module/Admin.php:502
 msgid "Administrator Information"
 msgstr "Información del Administrador"
 
-#: ../../Zotlabs/Module/Admin.php:474
+#: ../../Zotlabs/Module/Admin.php:502
 msgid ""
 "Contact information for site administrators.  Displayed on siteinfo page.  "
 "BBCode can be used here"
 msgstr "Información de contacto de los administradores del sitio. Visible en la página \"siteinfo\". Se puede usar BBCode"
 
-#: ../../Zotlabs/Module/Admin.php:475
+#: ../../Zotlabs/Module/Admin.php:503
 msgid "System language"
 msgstr "Idioma del sistema"
 
-#: ../../Zotlabs/Module/Admin.php:476
+#: ../../Zotlabs/Module/Admin.php:504
 msgid "System theme"
 msgstr "Tema gráfico del sistema"
 
-#: ../../Zotlabs/Module/Admin.php:476
+#: ../../Zotlabs/Module/Admin.php:504
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr "Tema del sistema por defecto - se puede cambiar por cada perfil de usuario - <a href='#' id='cnftheme'>modificar los ajustes del tema</a>"
 
-#: ../../Zotlabs/Module/Admin.php:477
+#: ../../Zotlabs/Module/Admin.php:505
 msgid "Mobile system theme"
 msgstr "Tema del sistema para móviles"
 
-#: ../../Zotlabs/Module/Admin.php:477
+#: ../../Zotlabs/Module/Admin.php:505
 msgid "Theme for mobile devices"
 msgstr "Tema para dispositivos móviles"
 
-#: ../../Zotlabs/Module/Admin.php:479
+#: ../../Zotlabs/Module/Admin.php:507
 msgid "Allow Feeds as Connections"
 msgstr "Permitir contenidos RSS como conexiones"
 
-#: ../../Zotlabs/Module/Admin.php:479
+#: ../../Zotlabs/Module/Admin.php:507
 msgid "(Heavy system resource usage)"
 msgstr "(Uso intenso de los recursos del sistema)"
 
-#: ../../Zotlabs/Module/Admin.php:480
+#: ../../Zotlabs/Module/Admin.php:508
 msgid "Maximum image size"
 msgstr "Tamaño máximo de la imagen"
 
-#: ../../Zotlabs/Module/Admin.php:480
+#: ../../Zotlabs/Module/Admin.php:508
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr "Tamaño máximo en bytes de la imagen subida. Por defecto, es 0, lo que significa que no hay límites."
 
-#: ../../Zotlabs/Module/Admin.php:481
+#: ../../Zotlabs/Module/Admin.php:509
 msgid "Does this site allow new member registration?"
 msgstr "¿Debe este sitio permitir el registro de nuevos miembros?"
 
-#: ../../Zotlabs/Module/Admin.php:482
+#: ../../Zotlabs/Module/Admin.php:510
 msgid "Invitation only"
 msgstr "Solo con una invitación"
 
-#: ../../Zotlabs/Module/Admin.php:482
+#: ../../Zotlabs/Module/Admin.php:510
 msgid ""
 "Only allow new member registrations with an invitation code. Above register "
 "policy must be set to Yes."
 msgstr "Solo se permiten inscripciones de nuevos miembros con un código de invitación. Además, deben aceptarse los términos del registro marcando \"Sí\"."
 
-#: ../../Zotlabs/Module/Admin.php:483
+#: ../../Zotlabs/Module/Admin.php:511
 msgid "Which best describes the types of account offered by this hub?"
 msgstr "¿Cómo describiría el tipo de servicio ofrecido por este servidor?"
 
-#: ../../Zotlabs/Module/Admin.php:484
+#: ../../Zotlabs/Module/Admin.php:512
 msgid "Register text"
 msgstr "Texto del registro"
 
-#: ../../Zotlabs/Module/Admin.php:484
+#: ../../Zotlabs/Module/Admin.php:512
 msgid "Will be displayed prominently on the registration page."
 msgstr "Se mostrará de forma destacada en la página de registro."
 
-#: ../../Zotlabs/Module/Admin.php:485
+#: ../../Zotlabs/Module/Admin.php:513
 msgid "Site homepage to show visitors (default: login box)"
 msgstr "Página personal que se mostrará a los visitantes (por defecto: la página de identificación)"
 
-#: ../../Zotlabs/Module/Admin.php:485
+#: ../../Zotlabs/Module/Admin.php:513
 msgid ""
 "example: 'public' to show public stream, 'page/sys/home' to show a system "
 "webpage called 'home' or 'include:home.html' to include a file."
 msgstr "ejemplo: 'public' para mostrar contenido público, 'page/sys/home' para mostrar la página web definida como \"home\" o 'include:home.html' para mostrar el contenido de un fichero."
 
-#: ../../Zotlabs/Module/Admin.php:486
+#: ../../Zotlabs/Module/Admin.php:514
 msgid "Preserve site homepage URL"
 msgstr "Preservar la dirección de la página personal"
 
-#: ../../Zotlabs/Module/Admin.php:486
+#: ../../Zotlabs/Module/Admin.php:514
 msgid ""
 "Present the site homepage in a frame at the original location instead of "
 "redirecting"
 msgstr "Presenta la página personal del sitio en un marco en la ubicación original, en vez de redirigirla."
 
-#: ../../Zotlabs/Module/Admin.php:487
+#: ../../Zotlabs/Module/Admin.php:515
 msgid "Accounts abandoned after x days"
 msgstr "Cuentas abandonadas después de x días"
 
-#: ../../Zotlabs/Module/Admin.php:487
+#: ../../Zotlabs/Module/Admin.php:515
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr "Para evitar consumir recursos del sistema intentando poner al día las cuentas abandonadas. Introduzca 0 para no tener límite de tiempo."
 
-#: ../../Zotlabs/Module/Admin.php:488
+#: ../../Zotlabs/Module/Admin.php:516
 msgid "Allowed friend domains"
 msgstr "Dominios amigos permitidos"
 
-#: ../../Zotlabs/Module/Admin.php:488
+#: ../../Zotlabs/Module/Admin.php:516
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr "Lista separada por comas de dominios a los que está permitido establecer relaciones de amistad con este sitio. Se permiten comodines. Dejar en claro para aceptar cualquier dominio."
 
-#: ../../Zotlabs/Module/Admin.php:489
+#: ../../Zotlabs/Module/Admin.php:517
 msgid "Allowed email domains"
 msgstr "Se aceptan dominios de correo electrónico"
 
-#: ../../Zotlabs/Module/Admin.php:489
+#: ../../Zotlabs/Module/Admin.php:517
 msgid ""
 "Comma separated list of domains which are allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains"
 msgstr "Lista separada por comas de los dominios de los que se acepta una dirección de correo electrónico para registros en este sitio. Se permiten comodines. Dejar en claro para aceptar cualquier dominio. "
 
-#: ../../Zotlabs/Module/Admin.php:490
+#: ../../Zotlabs/Module/Admin.php:518
 msgid "Not allowed email domains"
 msgstr "No se permiten dominios de correo electrónico"
 
-#: ../../Zotlabs/Module/Admin.php:490
+#: ../../Zotlabs/Module/Admin.php:518
 msgid ""
 "Comma separated list of domains which are not allowed in email addresses for"
 " registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains, unless allowed domains have been defined."
 msgstr "Lista separada por comas de los dominios de los que no se acepta una dirección de correo electrónico para registros en este sitio. Se permiten comodines. Dejar en claro para no aceptar cualquier dominio, excepto los que se hayan autorizado."
 
-#: ../../Zotlabs/Module/Admin.php:491
+#: ../../Zotlabs/Module/Admin.php:519
 msgid "Verify Email Addresses"
 msgstr "Verificar las direcciones de correo electrónico"
 
-#: ../../Zotlabs/Module/Admin.php:491
+#: ../../Zotlabs/Module/Admin.php:519
 msgid ""
 "Check to verify email addresses used in account registration (recommended)."
 msgstr "Activar para la verificación de la dirección de correo electrónico en el registro de una cuenta (recomendado)."
 
-#: ../../Zotlabs/Module/Admin.php:492
+#: ../../Zotlabs/Module/Admin.php:520
 msgid "Force publish"
 msgstr "Forzar la publicación"
 
-#: ../../Zotlabs/Module/Admin.php:492
+#: ../../Zotlabs/Module/Admin.php:520
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr "Intentar forzar todos los perfiles para que sean listados en el directorio de este sitio."
 
-#: ../../Zotlabs/Module/Admin.php:493
+#: ../../Zotlabs/Module/Admin.php:521
 msgid "Import Public Streams"
 msgstr "Importar contenido público"
 
-#: ../../Zotlabs/Module/Admin.php:493
+#: ../../Zotlabs/Module/Admin.php:521
 msgid ""
 "Import and allow access to public content pulled from other sites. Warning: "
 "this content is unmoderated."
 msgstr "Importar y permitir acceso al contenido público sacado de otros sitios. Advertencia: este contenido no está moderado, por lo que podría encontrar cosas inapropiadas u ofensivas."
 
-#: ../../Zotlabs/Module/Admin.php:494
+#: ../../Zotlabs/Module/Admin.php:522
 msgid "Login on Homepage"
 msgstr "Iniciar sesión en la página personal"
 
-#: ../../Zotlabs/Module/Admin.php:494
+#: ../../Zotlabs/Module/Admin.php:522
 msgid ""
 "Present a login box to visitors on the home page if no other content has "
 "been configured."
 msgstr "Presentar a los visitantes una casilla de identificación en la página de inicio, si no se ha configurado otro tipo de contenido."
 
-#: ../../Zotlabs/Module/Admin.php:495
+#: ../../Zotlabs/Module/Admin.php:523
 msgid "Enable context help"
 msgstr "Habilitar la ayuda contextual"
 
-#: ../../Zotlabs/Module/Admin.php:495
+#: ../../Zotlabs/Module/Admin.php:523
 msgid ""
 "Display contextual help for the current page when the help button is "
 "pressed."
 msgstr "Ver la ayuda contextual para la página actual cuando se pulse el botón de Ayuda."
 
-#: ../../Zotlabs/Module/Admin.php:497
+#: ../../Zotlabs/Module/Admin.php:525
 msgid "Directory Server URL"
 msgstr "URL del servidor de directorio"
 
-#: ../../Zotlabs/Module/Admin.php:497
+#: ../../Zotlabs/Module/Admin.php:525
 msgid "Default directory server"
 msgstr "Servidor de directorio predeterminado"
 
-#: ../../Zotlabs/Module/Admin.php:499
+#: ../../Zotlabs/Module/Admin.php:527
 msgid "Proxy user"
 msgstr "Usuario del proxy"
 
-#: ../../Zotlabs/Module/Admin.php:500
+#: ../../Zotlabs/Module/Admin.php:528
 msgid "Proxy URL"
 msgstr "Dirección del proxy"
 
-#: ../../Zotlabs/Module/Admin.php:501
+#: ../../Zotlabs/Module/Admin.php:529
 msgid "Network timeout"
 msgstr "Tiempo de espera de la red"
 
-#: ../../Zotlabs/Module/Admin.php:501
+#: ../../Zotlabs/Module/Admin.php:529
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr "Valor en segundos. Poner a 0 para que no haya tiempo límite (no recomendado)"
 
-#: ../../Zotlabs/Module/Admin.php:502
+#: ../../Zotlabs/Module/Admin.php:530
 msgid "Delivery interval"
 msgstr "Intervalo de entrega"
 
-#: ../../Zotlabs/Module/Admin.php:502
+#: ../../Zotlabs/Module/Admin.php:530
 msgid ""
 "Delay background delivery processes by this many seconds to reduce system "
 "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
 "for large dedicated servers."
 msgstr "Retrasar los procesos de transmisión en segundo plano por esta cantidad de segundos para reducir la carga del sistema. Recomendado: 4-5 para sitios compartidos, 2-3 para servidores virtuales privados, 0-1 para grandes servidores dedicados."
 
-#: ../../Zotlabs/Module/Admin.php:503
+#: ../../Zotlabs/Module/Admin.php:531
 msgid "Deliveries per process"
 msgstr "Intentos de envío por proceso"
 
-#: ../../Zotlabs/Module/Admin.php:503
+#: ../../Zotlabs/Module/Admin.php:531
 msgid ""
 "Number of deliveries to attempt in a single operating system process. Adjust"
 " if necessary to tune system performance. Recommend: 1-5."
 msgstr "Numero de envíos a intentar en un único proceso del sistema operativo. Ajustar si es necesario mejorar el rendimiento. Se recomienda: 1-5."
 
-#: ../../Zotlabs/Module/Admin.php:504
+#: ../../Zotlabs/Module/Admin.php:532
 msgid "Poll interval"
 msgstr "Intervalo máximo de tiempo entre dos mensajes sucesivos"
 
-#: ../../Zotlabs/Module/Admin.php:504
+#: ../../Zotlabs/Module/Admin.php:532
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr "Retrasar el intervalo de envío en segundo plano, en esta cantidad de segundos, para reducir la carga del sistema. Si es 0, usar el intervalo de entrega."
 
-#: ../../Zotlabs/Module/Admin.php:505
+#: ../../Zotlabs/Module/Admin.php:533
 msgid "Maximum Load Average"
 msgstr "Carga media máxima"
 
-#: ../../Zotlabs/Module/Admin.php:505
+#: ../../Zotlabs/Module/Admin.php:533
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr "Carga máxima del sistema antes de que los procesos de entrega y envío se hayan retardado - por defecto, 50."
 
-#: ../../Zotlabs/Module/Admin.php:506
+#: ../../Zotlabs/Module/Admin.php:534
 msgid "Expiration period in days for imported (grid/network) content"
 msgstr "Caducidad del contenido importado de otros sitios (en días)"
 
-#: ../../Zotlabs/Module/Admin.php:506
+#: ../../Zotlabs/Module/Admin.php:534
 msgid "0 for no expiration of imported content"
 msgstr "0 para que no caduque el contenido importado"
 
-#: ../../Zotlabs/Module/Admin.php:643 ../../Zotlabs/Module/Admin.php:644
-#: ../../Zotlabs/Module/Settings.php:720
+#: ../../Zotlabs/Module/Admin.php:677 ../../Zotlabs/Module/Admin.php:678
+#: ../../Zotlabs/Module/Settings.php:722
 msgid "Off"
 msgstr "Desactivado"
 
-#: ../../Zotlabs/Module/Admin.php:643 ../../Zotlabs/Module/Admin.php:644
-#: ../../Zotlabs/Module/Settings.php:720
+#: ../../Zotlabs/Module/Admin.php:677 ../../Zotlabs/Module/Admin.php:678
+#: ../../Zotlabs/Module/Settings.php:722
 msgid "On"
 msgstr "Activado"
 
-#: ../../Zotlabs/Module/Admin.php:644
+#: ../../Zotlabs/Module/Admin.php:678
 #, php-format
 msgid "Lock feature %s"
 msgstr "Bloquear la funcionalidad %s"
 
-#: ../../Zotlabs/Module/Admin.php:652
+#: ../../Zotlabs/Module/Admin.php:686
 msgid "Manage Additional Features"
 msgstr "Gestionar las funcionalidades"
 
-#: ../../Zotlabs/Module/Admin.php:669
+#: ../../Zotlabs/Module/Admin.php:703
 msgid "No server found"
 msgstr "Servidor no encontrado"
 
-#: ../../Zotlabs/Module/Admin.php:676 ../../Zotlabs/Module/Admin.php:1006
+#: ../../Zotlabs/Module/Admin.php:710 ../../Zotlabs/Module/Admin.php:1048
 msgid "ID"
 msgstr "ID"
 
-#: ../../Zotlabs/Module/Admin.php:676
+#: ../../Zotlabs/Module/Admin.php:710
 msgid "for channel"
 msgstr "por canal"
 
-#: ../../Zotlabs/Module/Admin.php:676
+#: ../../Zotlabs/Module/Admin.php:710
 msgid "on server"
 msgstr "en el servidor"
 
-#: ../../Zotlabs/Module/Admin.php:676 ../../Zotlabs/Module/Connections.php:270
+#: ../../Zotlabs/Module/Admin.php:710 ../../Zotlabs/Module/Connections.php:270
 msgid "Status"
 msgstr "Estado"
 
-#: ../../Zotlabs/Module/Admin.php:678
+#: ../../Zotlabs/Module/Admin.php:712
 msgid "Server"
 msgstr "Servidor"
 
-#: ../../Zotlabs/Module/Admin.php:718 ../../include/widgets.php:1337
+#: ../../Zotlabs/Module/Admin.php:746
+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."
+
+#: ../../Zotlabs/Module/Admin.php:749
+msgid ""
+"The recommended setting is to only allow unfiltered HTML from the following "
+"sites:"
+msgstr "La configuración recomendada es que sólo se permita HTML sin filtrar desde los siguientes sitios: "
+
+#: ../../Zotlabs/Module/Admin.php:750
+msgid ""
+"https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/<br"
+" />https://vimeo.com/<br />https://soundcloud.com/<br />"
+msgstr "https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/<br />https://vimeo.com/<br />https://soundcloud.com/<br />"
+
+#: ../../Zotlabs/Module/Admin.php:751
+msgid ""
+"All other embedded content will be filtered, <strong>unless</strong> "
+"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
 msgid "Security"
 msgstr "Seguridad"
 
-#: ../../Zotlabs/Module/Admin.php:720
+#: ../../Zotlabs/Module/Admin.php:758
 msgid "Block public"
 msgstr "Bloquear páginas públicas"
 
-#: ../../Zotlabs/Module/Admin.php:720
+#: ../../Zotlabs/Module/Admin.php:758
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently authenticated."
 msgstr "Habilitar para impedir ver las páginas personales de este sitio a quien no esté actualmente autenticado."
 
-#: ../../Zotlabs/Module/Admin.php:721
+#: ../../Zotlabs/Module/Admin.php:759
+msgid "Set \"Transport Security\" HTTP header"
+msgstr "Habilitar \"Seguridad de transporte\" (\"Transport Security\") en la cabecera HTTP"
+
+#: ../../Zotlabs/Module/Admin.php:760
+msgid "Set \"Content Security Policy\" HTTP header"
+msgstr "Habilitar la \"Política de seguridad del contenido\" (\"Content Security Policy\") en la cabecera HTTP"
+
+#: ../../Zotlabs/Module/Admin.php:761
 msgid "Allow communications only from these sites"
 msgstr "Permitir la comunicación solo desde estos sitios"
 
-#: ../../Zotlabs/Module/Admin.php:721
+#: ../../Zotlabs/Module/Admin.php:761
 msgid ""
 "One site per line. Leave empty to allow communication from anywhere by "
 "default"
 msgstr "Un sitio por línea. Dejar en blanco para permitir por defecto la comunicación desde cualquiera"
 
-#: ../../Zotlabs/Module/Admin.php:722
+#: ../../Zotlabs/Module/Admin.php:762
 msgid "Block communications from these sites"
 msgstr "Bloquear la comunicación desde estos sitios"
 
-#: ../../Zotlabs/Module/Admin.php:723
+#: ../../Zotlabs/Module/Admin.php:763
 msgid "Allow communications only from these channels"
 msgstr "Permitir la comunicación solo desde estos canales"
 
-#: ../../Zotlabs/Module/Admin.php:723
+#: ../../Zotlabs/Module/Admin.php:763
 msgid ""
 "One channel (hash) per line. Leave empty to allow from any channel by "
 "default"
 msgstr "Un canal (hash) por línea. Dejar en blanco para permitir por defecto la comunicación desde cualquiera"
 
-#: ../../Zotlabs/Module/Admin.php:724
+#: ../../Zotlabs/Module/Admin.php:764
 msgid "Block communications from these channels"
 msgstr "Bloquear la comunicación desde estos canales"
 
-#: ../../Zotlabs/Module/Admin.php:725
-msgid "Allow embedded HTML content only from these domains"
-msgstr "Permitir contenido con HTML incorporado solo desde estos dominios"
+#: ../../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)."
 
-#: ../../Zotlabs/Module/Admin.php:725
-msgid "One site per line. Leave empty to allow from any site by default"
-msgstr "Un sitio por línea. Dejar en blanco para permitirlo por defecto desde cualquier sitio"
+#: ../../Zotlabs/Module/Admin.php:766
+msgid "Allow unfiltered embedded HTML content only from these domains"
+msgstr "Permitir contenido HTML sin filtrar sólo desde estos dominios "
 
-#: ../../Zotlabs/Module/Admin.php:726
+#: ../../Zotlabs/Module/Admin.php:766
+msgid "One site per line. By default embedded content is filtered."
+msgstr "Un sitio por línea. El contenido incorporado se filtra de forma predeterminada."
+
+#: ../../Zotlabs/Module/Admin.php:767
 msgid "Block embedded HTML from these domains"
 msgstr "Bloquear contenido con HTML incorporado desde estos dominios"
 
-#: ../../Zotlabs/Module/Admin.php:743
+#: ../../Zotlabs/Module/Admin.php:785
 msgid "Update has been marked successful"
 msgstr "La actualización ha sido marcada como exitosa"
 
-#: ../../Zotlabs/Module/Admin.php:753
+#: ../../Zotlabs/Module/Admin.php:795
 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr "La ejecución de %s ha fallado. Mirar en los informes del sistema."
 
-#: ../../Zotlabs/Module/Admin.php:756
+#: ../../Zotlabs/Module/Admin.php:798
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr "La actualización de %s se ha realizado exitosamente."
 
-#: ../../Zotlabs/Module/Admin.php:760
+#: ../../Zotlabs/Module/Admin.php:802
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr "La actualización de %s no ha devuelto ningún estado. No se sabe si ha tenido éxito."
 
-#: ../../Zotlabs/Module/Admin.php:763
+#: ../../Zotlabs/Module/Admin.php:805
 #, php-format
 msgid "Update function %s could not be found."
 msgstr "No se encuentra la función de actualización de %s."
 
-#: ../../Zotlabs/Module/Admin.php:779
+#: ../../Zotlabs/Module/Admin.php:821
 msgid "No failed updates."
 msgstr "No ha fallado ninguna actualización."
 
-#: ../../Zotlabs/Module/Admin.php:783
+#: ../../Zotlabs/Module/Admin.php:825
 msgid "Failed Updates"
 msgstr "Han fallado las actualizaciones"
 
-#: ../../Zotlabs/Module/Admin.php:785
+#: ../../Zotlabs/Module/Admin.php:827
 msgid "Mark success (if update was manually applied)"
 msgstr "Marcar como exitosa (si la actualización se ha hecho manualmente)"
 
-#: ../../Zotlabs/Module/Admin.php:786
+#: ../../Zotlabs/Module/Admin.php:828
 msgid "Attempt to execute this update step automatically"
 msgstr "Intentar ejecutar este paso de actualización automáticamente"
 
-#: ../../Zotlabs/Module/Admin.php:817
+#: ../../Zotlabs/Module/Admin.php:859
 msgid "Queue Statistics"
 msgstr "Estadísticas de la cola"
 
-#: ../../Zotlabs/Module/Admin.php:818
+#: ../../Zotlabs/Module/Admin.php:860
 msgid "Total Entries"
 msgstr "Total de entradas"
 
-#: ../../Zotlabs/Module/Admin.php:819
+#: ../../Zotlabs/Module/Admin.php:861
 msgid "Priority"
 msgstr "Prioridad"
 
-#: ../../Zotlabs/Module/Admin.php:820
+#: ../../Zotlabs/Module/Admin.php:862
 msgid "Destination URL"
 msgstr "Dirección de destino"
 
-#: ../../Zotlabs/Module/Admin.php:821
+#: ../../Zotlabs/Module/Admin.php:863
 msgid "Mark hub permanently offline"
 msgstr "Marcar el servidor como permanentemente fuera de línea"
 
-#: ../../Zotlabs/Module/Admin.php:822
+#: ../../Zotlabs/Module/Admin.php:864
 msgid "Empty queue for this hub"
 msgstr "Vaciar la cola para este servidor"
 
-#: ../../Zotlabs/Module/Admin.php:823
+#: ../../Zotlabs/Module/Admin.php:865
 msgid "Last known contact"
 msgstr "Último contacto conocido"
 
-#: ../../Zotlabs/Module/Admin.php:859
+#: ../../Zotlabs/Module/Admin.php:901
 #, php-format
 msgid "%s account blocked/unblocked"
 msgid_plural "%s account blocked/unblocked"
 msgstr[0] "%s cuenta bloqueada/desbloqueada"
 msgstr[1] "%s cuenta bloqueada/desbloqueada"
 
-#: ../../Zotlabs/Module/Admin.php:867
+#: ../../Zotlabs/Module/Admin.php:909
 #, 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:903
+#: ../../Zotlabs/Module/Admin.php:945
 msgid "Account not found"
 msgstr "Cuenta no encontrada"
 
-#: ../../Zotlabs/Module/Admin.php:915
+#: ../../Zotlabs/Module/Admin.php:957
 #, php-format
 msgid "Account '%s' deleted"
 msgstr "La cuenta '%s' ha sido eliminada"
 
-#: ../../Zotlabs/Module/Admin.php:923
+#: ../../Zotlabs/Module/Admin.php:965
 #, php-format
 msgid "Account '%s' blocked"
 msgstr "La cuenta '%s' ha sido bloqueada"
 
-#: ../../Zotlabs/Module/Admin.php:931
+#: ../../Zotlabs/Module/Admin.php:973
 #, php-format
 msgid "Account '%s' unblocked"
 msgstr "La cuenta '%s' ha sido desbloqueada"
 
-#: ../../Zotlabs/Module/Admin.php:993 ../../Zotlabs/Module/Admin.php:1005
+#: ../../Zotlabs/Module/Admin.php:1035 ../../Zotlabs/Module/Admin.php:1047
 msgid "Users"
 msgstr "Usuarios"
 
-#: ../../Zotlabs/Module/Admin.php:995 ../../Zotlabs/Module/Admin.php:1159
+#: ../../Zotlabs/Module/Admin.php:1037 ../../Zotlabs/Module/Admin.php:1201
 msgid "select all"
 msgstr "seleccionar todo"
 
-#: ../../Zotlabs/Module/Admin.php:996
+#: ../../Zotlabs/Module/Admin.php:1038
 msgid "User registrations waiting for confirm"
 msgstr "Registros de usuario en espera de aprobación"
 
-#: ../../Zotlabs/Module/Admin.php:997
+#: ../../Zotlabs/Module/Admin.php:1039
 msgid "Request date"
 msgstr "Fecha de solicitud"
 
-#: ../../Zotlabs/Module/Admin.php:997 ../../Zotlabs/Module/Admin.php:1006
+#: ../../Zotlabs/Module/Admin.php:1039 ../../Zotlabs/Module/Admin.php:1048
 #: ../../Zotlabs/Module/Id.php:17 ../../Zotlabs/Module/Id.php:18
 #: ../../include/contact_selectors.php:81 ../../boot.php:1617
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: ../../Zotlabs/Module/Admin.php:998
+#: ../../Zotlabs/Module/Admin.php:1040
 msgid "No registrations."
 msgstr "Sin registros."
 
-#: ../../Zotlabs/Module/Admin.php:999 ../../Zotlabs/Module/Connections.php:275
+#: ../../Zotlabs/Module/Admin.php:1041
+#: ../../Zotlabs/Module/Connections.php:275
 msgid "Approve"
 msgstr "Aprobar"
 
-#: ../../Zotlabs/Module/Admin.php:1000
+#: ../../Zotlabs/Module/Admin.php:1042
 msgid "Deny"
 msgstr "Rechazar"
 
-#: ../../Zotlabs/Module/Admin.php:1002 ../../Zotlabs/Module/Connedit.php:541
+#: ../../Zotlabs/Module/Admin.php:1044 ../../Zotlabs/Module/Connedit.php:541
 msgid "Block"
 msgstr "Bloquear"
 
-#: ../../Zotlabs/Module/Admin.php:1003 ../../Zotlabs/Module/Connedit.php:541
+#: ../../Zotlabs/Module/Admin.php:1045 ../../Zotlabs/Module/Connedit.php:541
 msgid "Unblock"
 msgstr "Desbloquear"
 
-#: ../../Zotlabs/Module/Admin.php:1006 ../../include/group.php:267
+#: ../../Zotlabs/Module/Admin.php:1048 ../../include/group.php:267
 msgid "All Channels"
 msgstr "Todos los canales"
 
-#: ../../Zotlabs/Module/Admin.php:1006
+#: ../../Zotlabs/Module/Admin.php:1048
 msgid "Register date"
 msgstr "Fecha de registro"
 
-#: ../../Zotlabs/Module/Admin.php:1006
+#: ../../Zotlabs/Module/Admin.php:1048
 msgid "Last login"
 msgstr "Último acceso"
 
-#: ../../Zotlabs/Module/Admin.php:1006
+#: ../../Zotlabs/Module/Admin.php:1048
 msgid "Expires"
 msgstr "Caduca"
 
-#: ../../Zotlabs/Module/Admin.php:1006
+#: ../../Zotlabs/Module/Admin.php:1048
 msgid "Service Class"
 msgstr "Clase de servicio"
 
-#: ../../Zotlabs/Module/Admin.php:1008
+#: ../../Zotlabs/Module/Admin.php:1050
 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:1009
+#: ../../Zotlabs/Module/Admin.php:1051
 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:1045
+#: ../../Zotlabs/Module/Admin.php:1087
 #, 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:1054
+#: ../../Zotlabs/Module/Admin.php:1096
 #, 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:1061
+#: ../../Zotlabs/Module/Admin.php:1103
 #, 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:1081
+#: ../../Zotlabs/Module/Admin.php:1123
 msgid "Channel not found"
 msgstr "Canal no encontrado"
 
-#: ../../Zotlabs/Module/Admin.php:1092
+#: ../../Zotlabs/Module/Admin.php:1134
 #, php-format
 msgid "Channel '%s' deleted"
 msgstr "Canal '%s' eliminado"
 
-#: ../../Zotlabs/Module/Admin.php:1104
+#: ../../Zotlabs/Module/Admin.php:1146
 #, php-format
 msgid "Channel '%s' censored"
 msgstr "Canal '%s' censurado"
 
-#: ../../Zotlabs/Module/Admin.php:1104
+#: ../../Zotlabs/Module/Admin.php:1146
 #, php-format
 msgid "Channel '%s' uncensored"
 msgstr "Canal '%s' no censurado"
 
-#: ../../Zotlabs/Module/Admin.php:1115
+#: ../../Zotlabs/Module/Admin.php:1157
 #, php-format
 msgid "Channel '%s' code allowed"
 msgstr "Código permitido al canal '%s'"
 
-#: ../../Zotlabs/Module/Admin.php:1115
+#: ../../Zotlabs/Module/Admin.php:1157
 #, php-format
 msgid "Channel '%s' code disallowed"
 msgstr "Código no permitido al canal '%s'"
 
-#: ../../Zotlabs/Module/Admin.php:1157 ../../include/widgets.php:1336
+#: ../../Zotlabs/Module/Admin.php:1199 ../../include/widgets.php:1385
 msgid "Channels"
 msgstr "Canales"
 
-#: ../../Zotlabs/Module/Admin.php:1161
+#: ../../Zotlabs/Module/Admin.php:1203
 msgid "Censor"
 msgstr "Censurar"
 
-#: ../../Zotlabs/Module/Admin.php:1162
+#: ../../Zotlabs/Module/Admin.php:1204
 msgid "Uncensor"
 msgstr "No censurar"
 
-#: ../../Zotlabs/Module/Admin.php:1163
+#: ../../Zotlabs/Module/Admin.php:1205
 msgid "Allow Code"
 msgstr "Permitir código"
 
-#: ../../Zotlabs/Module/Admin.php:1164
+#: ../../Zotlabs/Module/Admin.php:1206
 msgid "Disallow Code"
 msgstr "No permitir código"
 
-#: ../../Zotlabs/Module/Admin.php:1165 ../../include/conversation.php:1629
+#: ../../Zotlabs/Module/Admin.php:1207 ../../include/conversation.php:1617
 msgid "Channel"
 msgstr "Canal"
 
-#: ../../Zotlabs/Module/Admin.php:1166
+#: ../../Zotlabs/Module/Admin.php:1208
 msgid "UID"
 msgstr "UID"
 
-#: ../../Zotlabs/Module/Admin.php:1166 ../../Zotlabs/Module/Locs.php:118
+#: ../../Zotlabs/Module/Admin.php:1208 ../../Zotlabs/Module/Locs.php:118
 #: ../../Zotlabs/Module/Profiles.php:469
 msgid "Address"
 msgstr "Dirección"
 
-#: ../../Zotlabs/Module/Admin.php:1168
+#: ../../Zotlabs/Module/Admin.php:1210
 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:1169
+#: ../../Zotlabs/Module/Admin.php:1211
 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:1226
+#: ../../Zotlabs/Module/Admin.php:1268
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "Extensión %s desactivada."
 
-#: ../../Zotlabs/Module/Admin.php:1230
+#: ../../Zotlabs/Module/Admin.php:1272
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "Extensión %s activada."
 
-#: ../../Zotlabs/Module/Admin.php:1240 ../../Zotlabs/Module/Admin.php:1466
+#: ../../Zotlabs/Module/Admin.php:1282 ../../Zotlabs/Module/Admin.php:1565
 msgid "Disable"
 msgstr "Desactivar"
 
-#: ../../Zotlabs/Module/Admin.php:1243 ../../Zotlabs/Module/Admin.php:1468
+#: ../../Zotlabs/Module/Admin.php:1285 ../../Zotlabs/Module/Admin.php:1567
 msgid "Enable"
 msgstr "Activar"
 
-#: ../../Zotlabs/Module/Admin.php:1272 ../../Zotlabs/Module/Admin.php:1333
-#: ../../include/widgets.php:1339
+#: ../../Zotlabs/Module/Admin.php:1314 ../../Zotlabs/Module/Admin.php:1404
+#: ../../include/widgets.php:1388
 msgid "Plugins"
-msgstr "Extensiones"
+msgstr "Extensiones (plugins)"
 
-#: ../../Zotlabs/Module/Admin.php:1273 ../../Zotlabs/Module/Admin.php:1495
+#: ../../Zotlabs/Module/Admin.php:1315 ../../Zotlabs/Module/Admin.php:1594
 msgid "Toggle"
 msgstr "Cambiar"
 
-#: ../../Zotlabs/Module/Admin.php:1274 ../../Zotlabs/Module/Admin.php:1496
-#: ../../include/apps.php:134 ../../include/widgets.php:589
-#: ../../include/nav.php:208
+#: ../../Zotlabs/Module/Admin.php:1316 ../../Zotlabs/Module/Admin.php:1595
+#: ../../include/widgets.php:638 ../../include/nav.php:208
+#: ../../include/apps.php:166
 msgid "Settings"
 msgstr "Ajustes"
 
-#: ../../Zotlabs/Module/Admin.php:1281 ../../Zotlabs/Module/Admin.php:1505
+#: ../../Zotlabs/Module/Admin.php:1323 ../../Zotlabs/Module/Admin.php:1604
 msgid "Author: "
 msgstr "Autor:"
 
-#: ../../Zotlabs/Module/Admin.php:1282 ../../Zotlabs/Module/Admin.php:1506
+#: ../../Zotlabs/Module/Admin.php:1324 ../../Zotlabs/Module/Admin.php:1605
 msgid "Maintainer: "
 msgstr "Mantenedor:"
 
-#: ../../Zotlabs/Module/Admin.php:1283
+#: ../../Zotlabs/Module/Admin.php:1325
 msgid "Minimum project version: "
 msgstr "Versión mínima del proyecto:"
 
-#: ../../Zotlabs/Module/Admin.php:1284
+#: ../../Zotlabs/Module/Admin.php:1326
 msgid "Maximum project version: "
 msgstr "Versión máxima del proyecto:"
 
-#: ../../Zotlabs/Module/Admin.php:1285
+#: ../../Zotlabs/Module/Admin.php:1327
 msgid "Minimum PHP version: "
 msgstr "Versión mínima de PHP:"
 
-#: ../../Zotlabs/Module/Admin.php:1286
+#: ../../Zotlabs/Module/Admin.php:1328
 msgid "Requires: "
 msgstr "Se requiere:"
 
-#: ../../Zotlabs/Module/Admin.php:1287 ../../Zotlabs/Module/Admin.php:1338
+#: ../../Zotlabs/Module/Admin.php:1329 ../../Zotlabs/Module/Admin.php:1409
 msgid "Disabled - version incompatibility"
 msgstr "Deshabilitado - versiones incompatibles"
 
-#: ../../Zotlabs/Module/Admin.php:1431
+#: ../../Zotlabs/Module/Admin.php:1378
+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
+msgid "Plugin repo git URL"
+msgstr "URL del repositorio git del plugin"
+
+#: ../../Zotlabs/Module/Admin.php:1380
+msgid "Custom repo name"
+msgstr "Nombre personalizado del repositorio"
+
+#: ../../Zotlabs/Module/Admin.php:1380
+msgid "(optional)"
+msgstr "(opcional)"
+
+#: ../../Zotlabs/Module/Admin.php:1381
+msgid "Download Plugin Repo"
+msgstr "Descargar el repositorio"
+
+#: ../../Zotlabs/Module/Admin.php:1388
+msgid "Install new repo"
+msgstr "Instalar un nuevo repositorio"
+
+#: ../../Zotlabs/Module/Admin.php:1389 ../../include/apps.php:284
+msgid "Install"
+msgstr "Instalar"
+
+#: ../../Zotlabs/Module/Admin.php:1390 ../../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
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: ../../Zotlabs/Module/Admin.php:1411
+msgid "Add Plugin Repo"
+msgstr "Añadir un repositorio"
+
+#: ../../Zotlabs/Module/Admin.php:1417 ../../Zotlabs/Module/Settings.php:77
+#: ../../Zotlabs/Module/Settings.php:616 ../../include/apps.php:284
+msgid "Update"
+msgstr "Actualizar"
+
+#: ../../Zotlabs/Module/Admin.php:1418
+msgid "Switch branch"
+msgstr "Cambiar la rama"
+
+#: ../../Zotlabs/Module/Admin.php:1419 ../../Zotlabs/Module/Photos.php:998
+#: ../../Zotlabs/Module/Tagrm.php:137
+msgid "Remove"
+msgstr "Eliminar"
+
+#: ../../Zotlabs/Module/Admin.php:1530
 msgid "No themes found."
 msgstr "No se han encontrado temas."
 
-#: ../../Zotlabs/Module/Admin.php:1487
+#: ../../Zotlabs/Module/Admin.php:1586
 msgid "Screenshot"
 msgstr "Instantánea de pantalla"
 
-#: ../../Zotlabs/Module/Admin.php:1494 ../../Zotlabs/Module/Admin.php:1528
-#: ../../include/widgets.php:1340
+#: ../../Zotlabs/Module/Admin.php:1593 ../../Zotlabs/Module/Admin.php:1627
+#: ../../include/widgets.php:1389
 msgid "Themes"
 msgstr "Temas"
 
-#: ../../Zotlabs/Module/Admin.php:1533
+#: ../../Zotlabs/Module/Admin.php:1632
 msgid "[Experimental]"
 msgstr "[Experimental]"
 
-#: ../../Zotlabs/Module/Admin.php:1534
+#: ../../Zotlabs/Module/Admin.php:1633
 msgid "[Unsupported]"
 msgstr "[No soportado]"
 
-#: ../../Zotlabs/Module/Admin.php:1558
+#: ../../Zotlabs/Module/Admin.php:1657
 msgid "Log settings updated."
 msgstr "Actualizado el informe de configuraciones."
 
-#: ../../Zotlabs/Module/Admin.php:1613 ../../include/widgets.php:1361
-#: ../../include/widgets.php:1371
+#: ../../Zotlabs/Module/Admin.php:1712 ../../include/widgets.php:1410
+#: ../../include/widgets.php:1420
 msgid "Logs"
 msgstr "Informes"
 
-#: ../../Zotlabs/Module/Admin.php:1615
+#: ../../Zotlabs/Module/Admin.php:1714
 msgid "Clear"
 msgstr "Vaciar"
 
-#: ../../Zotlabs/Module/Admin.php:1621
+#: ../../Zotlabs/Module/Admin.php:1720
 msgid "Debugging"
 msgstr "Depuración"
 
-#: ../../Zotlabs/Module/Admin.php:1622
+#: ../../Zotlabs/Module/Admin.php:1721
 msgid "Log file"
 msgstr "Fichero de informe"
 
-#: ../../Zotlabs/Module/Admin.php:1622
+#: ../../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:1623
+#: ../../Zotlabs/Module/Admin.php:1722
 msgid "Log level"
 msgstr "Nivel de depuración"
 
-#: ../../Zotlabs/Module/Admin.php:1690
+#: ../../Zotlabs/Module/Admin.php:1990
 msgid "New Profile Field"
 msgstr "Nuevo campo en el perfil"
 
-#: ../../Zotlabs/Module/Admin.php:1691 ../../Zotlabs/Module/Admin.php:1711
+#: ../../Zotlabs/Module/Admin.php:1991 ../../Zotlabs/Module/Admin.php:2011
 msgid "Field nickname"
 msgstr "Alias del campo"
 
-#: ../../Zotlabs/Module/Admin.php:1691 ../../Zotlabs/Module/Admin.php:1711
+#: ../../Zotlabs/Module/Admin.php:1991 ../../Zotlabs/Module/Admin.php:2011
 msgid "System name of field"
 msgstr "Nombre del campo en el sistema"
 
-#: ../../Zotlabs/Module/Admin.php:1692 ../../Zotlabs/Module/Admin.php:1712
+#: ../../Zotlabs/Module/Admin.php:1992 ../../Zotlabs/Module/Admin.php:2012
 msgid "Input type"
 msgstr "Tipo de entrada"
 
-#: ../../Zotlabs/Module/Admin.php:1693 ../../Zotlabs/Module/Admin.php:1713
+#: ../../Zotlabs/Module/Admin.php:1993 ../../Zotlabs/Module/Admin.php:2013
 msgid "Field Name"
 msgstr "Nombre del campo"
 
-#: ../../Zotlabs/Module/Admin.php:1693 ../../Zotlabs/Module/Admin.php:1713
+#: ../../Zotlabs/Module/Admin.php:1993 ../../Zotlabs/Module/Admin.php:2013
 msgid "Label on profile pages"
 msgstr "Etiqueta a mostrar en la página del perfil"
 
-#: ../../Zotlabs/Module/Admin.php:1694 ../../Zotlabs/Module/Admin.php:1714
+#: ../../Zotlabs/Module/Admin.php:1994 ../../Zotlabs/Module/Admin.php:2014
 msgid "Help text"
 msgstr "Texto de ayuda"
 
-#: ../../Zotlabs/Module/Admin.php:1694 ../../Zotlabs/Module/Admin.php:1714
+#: ../../Zotlabs/Module/Admin.php:1994 ../../Zotlabs/Module/Admin.php:2014
 msgid "Additional info (optional)"
 msgstr "Información adicional (opcional)"
 
-#: ../../Zotlabs/Module/Admin.php:1695 ../../Zotlabs/Module/Admin.php:1715
+#: ../../Zotlabs/Module/Admin.php:1995 ../../Zotlabs/Module/Admin.php:2015
 #: ../../Zotlabs/Module/Filer.php:53 ../../Zotlabs/Module/Rbmark.php:32
-#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/text.php:905
-#: ../../include/text.php:917 ../../include/widgets.php:201
+#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/widgets.php:201
+#: ../../include/text.php:934 ../../include/text.php:946
 msgid "Save"
 msgstr "Guardar"
 
-#: ../../Zotlabs/Module/Admin.php:1704
+#: ../../Zotlabs/Module/Admin.php:2004
 msgid "Field definition not found"
 msgstr "Definición del campo no encontrada"
 
-#: ../../Zotlabs/Module/Admin.php:1710
+#: ../../Zotlabs/Module/Admin.php:2010
 msgid "Edit Profile Field"
 msgstr "Modificar el campo del perfil"
 
-#: ../../Zotlabs/Module/Admin.php:1768 ../../include/widgets.php:1342
+#: ../../Zotlabs/Module/Admin.php:2068 ../../include/widgets.php:1391
 msgid "Profile Fields"
 msgstr "Campos del perfil"
 
-#: ../../Zotlabs/Module/Admin.php:1769
+#: ../../Zotlabs/Module/Admin.php:2069
 msgid "Basic Profile Fields"
 msgstr "Campos básicos del perfil"
 
-#: ../../Zotlabs/Module/Admin.php:1770
+#: ../../Zotlabs/Module/Admin.php:2070
 msgid "Advanced Profile Fields"
 msgstr "Campos avanzados del perfil"
 
-#: ../../Zotlabs/Module/Admin.php:1770
+#: ../../Zotlabs/Module/Admin.php:2070
 msgid "(In addition to basic fields)"
 msgstr "(Además de los campos básicos)"
 
-#: ../../Zotlabs/Module/Admin.php:1772
+#: ../../Zotlabs/Module/Admin.php:2072
 msgid "All available fields"
 msgstr "Todos los campos disponibles"
 
-#: ../../Zotlabs/Module/Admin.php:1773
+#: ../../Zotlabs/Module/Admin.php:2073
 msgid "Custom Fields"
 msgstr "Campos personalizados"
 
-#: ../../Zotlabs/Module/Admin.php:1777
+#: ../../Zotlabs/Module/Admin.php:2077
 msgid "Create Custom Field"
 msgstr "Crear un campo personalizado"
 
@@ -1310,70 +1412,74 @@ 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:32 ../../Zotlabs/Module/Appman.php:48
+#: ../../Zotlabs/Module/Appman.php:36 ../../Zotlabs/Module/Appman.php:52
 msgid "App installed."
 msgstr "Aplicación instalada."
 
-#: ../../Zotlabs/Module/Appman.php:41
+#: ../../Zotlabs/Module/Appman.php:45
 msgid "Malformed app."
 msgstr "Aplicación con errores"
 
-#: ../../Zotlabs/Module/Appman.php:84
+#: ../../Zotlabs/Module/Appman.php:103
 msgid "Embed code"
 msgstr "Código incorporado"
 
-#: ../../Zotlabs/Module/Appman.php:90
+#: ../../Zotlabs/Module/Appman.php:109 ../../include/widgets.php:107
 msgid "Edit App"
 msgstr "Modificar la aplicación"
 
-#: ../../Zotlabs/Module/Appman.php:90
+#: ../../Zotlabs/Module/Appman.php:109
 msgid "Create App"
 msgstr "Crear una aplicación"
 
-#: ../../Zotlabs/Module/Appman.php:95
+#: ../../Zotlabs/Module/Appman.php:114
 msgid "Name of app"
 msgstr "Nombre de la aplicación"
 
-#: ../../Zotlabs/Module/Appman.php:95 ../../Zotlabs/Module/Appman.php:96
-#: ../../Zotlabs/Module/Events.php:448 ../../Zotlabs/Module/Events.php:453
+#: ../../Zotlabs/Module/Appman.php:114 ../../Zotlabs/Module/Appman.php:115
+#: ../../Zotlabs/Module/Events.php:449 ../../Zotlabs/Module/Events.php:454
 #: ../../Zotlabs/Module/Profiles.php:713 ../../Zotlabs/Module/Profiles.php:717
 #: ../../include/datetime.php:246
 msgid "Required"
 msgstr "Obligatorio"
 
-#: ../../Zotlabs/Module/Appman.php:96
+#: ../../Zotlabs/Module/Appman.php:115
 msgid "Location (URL) of app"
 msgstr "Dirección (URL) de la aplicación"
 
-#: ../../Zotlabs/Module/Appman.php:97 ../../Zotlabs/Module/Events.php:461
+#: ../../Zotlabs/Module/Appman.php:116 ../../Zotlabs/Module/Events.php:462
 #: ../../Zotlabs/Module/Rbmark.php:101
 msgid "Description"
 msgstr "Descripción"
 
-#: ../../Zotlabs/Module/Appman.php:98
+#: ../../Zotlabs/Module/Appman.php:117
 msgid "Photo icon URL"
 msgstr "Dirección del icono"
 
-#: ../../Zotlabs/Module/Appman.php:98
+#: ../../Zotlabs/Module/Appman.php:117
 msgid "80 x 80 pixels - optional"
 msgstr "80 x 80 pixels - opcional"
 
-#: ../../Zotlabs/Module/Appman.php:99
+#: ../../Zotlabs/Module/Appman.php:118
+msgid "Categories (optional, comma separated list)"
+msgstr "Categorías (opcional, lista separada por comas)"
+
+#: ../../Zotlabs/Module/Appman.php:119
 msgid "Version ID"
 msgstr "Versión"
 
-#: ../../Zotlabs/Module/Appman.php:100
+#: ../../Zotlabs/Module/Appman.php:120
 msgid "Price of app"
 msgstr "Precio de la aplicación"
 
-#: ../../Zotlabs/Module/Appman.php:101
+#: ../../Zotlabs/Module/Appman.php:121
 msgid "Location (URL) to purchase app"
 msgstr "Dirección (URL) donde adquirir la aplicación"
 
-#: ../../Zotlabs/Module/Apps.php:40 ../../include/widgets.php:102
+#: ../../Zotlabs/Module/Apps.php:46 ../../include/widgets.php:102
 #: ../../include/nav.php:163
 msgid "Apps"
-msgstr "Aplicaciones"
+msgstr "Aplicaciones (apps)"
 
 #: ../../Zotlabs/Module/Attach.php:13
 msgid "Item not available."
@@ -1388,38 +1494,39 @@ msgstr "Elemento no válido."
 msgid "Channel not found."
 msgstr "Canal no encontrado."
 
-#: ../../Zotlabs/Module/Blocks.php:99 ../../Zotlabs/Module/Blocks.php:154
+#: ../../Zotlabs/Module/Blocks.php:97 ../../Zotlabs/Module/Blocks.php:152
+#: ../../Zotlabs/Module/Editblock.php:108
 msgid "Block Name"
 msgstr "Nombre del bloque"
 
-#: ../../Zotlabs/Module/Blocks.php:153 ../../include/text.php:2251
+#: ../../Zotlabs/Module/Blocks.php:151 ../../include/text.php:2277
 msgid "Blocks"
 msgstr "Bloques"
 
-#: ../../Zotlabs/Module/Blocks.php:155
+#: ../../Zotlabs/Module/Blocks.php:153
 msgid "Block Title"
 msgstr "Título del bloque"
 
-#: ../../Zotlabs/Module/Blocks.php:156 ../../Zotlabs/Module/Layouts.php:186
-#: ../../Zotlabs/Module/Menu.php:114 ../../Zotlabs/Module/Webpages.php:200
+#: ../../Zotlabs/Module/Blocks.php:154 ../../Zotlabs/Module/Layouts.php:188
+#: ../../Zotlabs/Module/Menu.php:114 ../../Zotlabs/Module/Webpages.php:198
 #: ../../include/page_widgets.php:44
 msgid "Created"
 msgstr "Creado"
 
-#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Layouts.php:187
-#: ../../Zotlabs/Module/Menu.php:115 ../../Zotlabs/Module/Webpages.php:201
+#: ../../Zotlabs/Module/Blocks.php:155 ../../Zotlabs/Module/Layouts.php:189
+#: ../../Zotlabs/Module/Menu.php:115 ../../Zotlabs/Module/Webpages.php:199
 #: ../../include/page_widgets.php:45
 msgid "Edited"
 msgstr "Editado"
 
-#: ../../Zotlabs/Module/Blocks.php:160 ../../Zotlabs/Module/Layouts.php:189
-#: ../../Zotlabs/Module/Photos.php:1071 ../../Zotlabs/Module/Webpages.php:190
-#: ../../include/conversation.php:1209
+#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Layouts.php:191
+#: ../../Zotlabs/Module/Photos.php:1072 ../../Zotlabs/Module/Webpages.php:188
+#: ../../include/conversation.php:1214
 msgid "Share"
 msgstr "Compartir"
 
-#: ../../Zotlabs/Module/Blocks.php:165 ../../Zotlabs/Module/Layouts.php:193
-#: ../../Zotlabs/Module/Pubsites.php:46 ../../Zotlabs/Module/Webpages.php:195
+#: ../../Zotlabs/Module/Blocks.php:163 ../../Zotlabs/Module/Layouts.php:195
+#: ../../Zotlabs/Module/Pubsites.php:46 ../../Zotlabs/Module/Webpages.php:193
 #: ../../include/page_widgets.php:39
 msgid "View"
 msgstr "Ver"
@@ -1436,79 +1543,69 @@ msgstr "Mis marcadores"
 msgid "My Connections Bookmarks"
 msgstr "Marcadores de mis conexiones"
 
-#: ../../Zotlabs/Module/Cal.php:41 ../../Zotlabs/Module/Photos.php:45
-#: ../../include/js_strings.php:13
-msgid "everybody"
-msgstr "cualquiera"
-
 #: ../../Zotlabs/Module/Cal.php:72
 msgid "Permissions denied."
 msgstr "Permisos denegados."
 
-#: ../../Zotlabs/Module/Cal.php:262 ../../Zotlabs/Module/Events.php:585
+#: ../../Zotlabs/Module/Cal.php:262 ../../Zotlabs/Module/Events.php:588
 msgid "l, F j"
 msgstr "l j F"
 
-#: ../../Zotlabs/Module/Cal.php:311 ../../Zotlabs/Module/Events.php:634
-#: ../../include/text.php:1714
+#: ../../Zotlabs/Module/Cal.php:311 ../../Zotlabs/Module/Events.php:637
+#: ../../include/text.php:1743
 msgid "Link to Source"
 msgstr "Enlazar con la entrada en su ubicación original"
 
-#: ../../Zotlabs/Module/Cal.php:334 ../../Zotlabs/Module/Events.php:662
+#: ../../Zotlabs/Module/Cal.php:334 ../../Zotlabs/Module/Events.php:665
 msgid "Edit Event"
 msgstr "Editar el evento"
 
-#: ../../Zotlabs/Module/Cal.php:334 ../../Zotlabs/Module/Events.php:662
+#: ../../Zotlabs/Module/Cal.php:334 ../../Zotlabs/Module/Events.php:665
 msgid "Create Event"
 msgstr "Crear un evento"
 
 #: ../../Zotlabs/Module/Cal.php:335 ../../Zotlabs/Module/Cal.php:342
-#: ../../Zotlabs/Module/Events.php:663 ../../Zotlabs/Module/Events.php:670
-#: ../../Zotlabs/Module/Photos.php:948
+#: ../../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/Events.php:664 ../../Zotlabs/Module/Events.php:671
-#: ../../Zotlabs/Module/Photos.php:957 ../../Zotlabs/Module/Setup.php:290
+#: ../../Zotlabs/Module/Events.php:667 ../../Zotlabs/Module/Events.php:674
+#: ../../Zotlabs/Module/Photos.php:958 ../../Zotlabs/Module/Setup.php:290
 msgid "Next"
 msgstr "Siguiente"
 
-#: ../../Zotlabs/Module/Cal.php:337 ../../Zotlabs/Module/Events.php:665
-#: ../../include/widgets.php:706
+#: ../../Zotlabs/Module/Cal.php:337 ../../Zotlabs/Module/Events.php:668
+#: ../../include/widgets.php:755
 msgid "Export"
 msgstr "Exportar"
 
-#: ../../Zotlabs/Module/Cal.php:340 ../../Zotlabs/Module/Events.php:668
-#: ../../include/widgets.php:707
+#: ../../Zotlabs/Module/Cal.php:340 ../../Zotlabs/Module/Events.php:671
+#: ../../include/widgets.php:756
 msgid "Import"
 msgstr "Importar"
 
-#: ../../Zotlabs/Module/Cal.php:344 ../../Zotlabs/Module/Events.php:672
+#: ../../Zotlabs/Module/Cal.php:344 ../../Zotlabs/Module/Events.php:675
 msgid "Today"
 msgstr "Hoy"
 
-#: ../../Zotlabs/Module/Channel.php:28 ../../Zotlabs/Module/Chat.php:23
+#: ../../Zotlabs/Module/Channel.php:29 ../../Zotlabs/Module/Chat.php:23
 msgid "You must be logged in to see this page."
 msgstr "Debe haber iniciado sesión para poder ver esta página."
 
-#: ../../Zotlabs/Module/Channel.php:40
+#: ../../Zotlabs/Module/Channel.php:41
 msgid "Posts and comments"
 msgstr "Publicaciones y comentarios"
 
-#: ../../Zotlabs/Module/Channel.php:41
+#: ../../Zotlabs/Module/Channel.php:42
 msgid "Only posts"
 msgstr "Solo publicaciones"
 
-#: ../../Zotlabs/Module/Channel.php:101
+#: ../../Zotlabs/Module/Channel.php:102
 msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr "Permisos insuficientes. Petición redirigida a la página del perfil."
 
-#: ../../Zotlabs/Module/Channel.php:135 ../../Zotlabs/Module/Network.php:173
-#: ../../Zotlabs/Module/Rpost.php:118
-msgid "Public"
-msgstr "Público"
-
 #: ../../Zotlabs/Module/Chat.php:179
 msgid "Room not found"
 msgstr "Sala no encontrada"
@@ -1534,21 +1631,19 @@ 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:1170
+#: ../../Zotlabs/Module/Mail.php:320 ../../include/conversation.php:1182
 msgid "Please enter a link URL:"
 msgstr "Por favor, introduzca la dirección del enlace:"
 
-#: ../../Zotlabs/Module/Chat.php:204 ../../Zotlabs/Module/Editpost.php:163
-#: ../../Zotlabs/Module/Mail.php:259 ../../Zotlabs/Module/Mail.php:389
-#: ../../include/ItemObject.php:715 ../../include/conversation.php:1274
+#: ../../Zotlabs/Module/Chat.php:204 ../../Zotlabs/Module/Mail.php:259
+#: ../../Zotlabs/Module/Mail.php:389 ../../include/ItemObject.php:715
+#: ../../include/conversation.php:1262
 msgid "Encrypt text"
 msgstr "Cifrar texto"
 
-#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Editblock.php:148
-#: ../../Zotlabs/Module/Editlayout.php:147
-#: ../../Zotlabs/Module/Editpost.php:126
-#: ../../Zotlabs/Module/Editwebpage.php:188 ../../Zotlabs/Module/Mail.php:253
-#: ../../Zotlabs/Module/Mail.php:383 ../../include/conversation.php:1225
+#: ../../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
 msgid "Insert web link"
 msgstr "Insertar enlace web"
 
@@ -1568,10 +1663,10 @@ msgstr "Nombre de la sala de chat"
 msgid "Expiration of chats (minutes)"
 msgstr "Caducidad de los mensajes en los chats (en minutos)"
 
-#: ../../Zotlabs/Module/Chat.php:233 ../../Zotlabs/Module/Filestorage.php:151
-#: ../../Zotlabs/Module/Photos.php:670 ../../Zotlabs/Module/Photos.php:1044
+#: ../../Zotlabs/Module/Chat.php:233 ../../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:251
+#: ../../include/acl_selectors.php:285
 msgid "Permissions"
 msgstr "Permisos"
 
@@ -1584,7 +1679,7 @@ msgstr "Salas de chat de %1$s"
 msgid "No chatrooms available"
 msgstr "No hay salas de chat disponibles"
 
-#: ../../Zotlabs/Module/Chat.php:250 ../../Zotlabs/Module/Manage.php:141
+#: ../../Zotlabs/Module/Chat.php:250 ../../Zotlabs/Module/Manage.php:143
 #: ../../Zotlabs/Module/Profiles.php:782
 msgid "Create New"
 msgstr "Crear"
@@ -1686,13 +1781,13 @@ msgstr "Archivadas"
 
 #: ../../Zotlabs/Module/Connections.php:76
 #: ../../Zotlabs/Module/Connections.php:86 ../../Zotlabs/Module/Menu.php:116
-#: ../../include/conversation.php:1553
+#: ../../include/conversation.php:1541
 msgid "New"
 msgstr "Nuevas"
 
 #: ../../Zotlabs/Module/Connections.php:92
 #: ../../Zotlabs/Module/Connections.php:107
-#: ../../Zotlabs/Module/Connedit.php:597 ../../include/widgets.php:448
+#: ../../Zotlabs/Module/Connedit.php:597 ../../include/widgets.php:497
 msgid "All"
 msgstr "Todos/as"
 
@@ -1776,14 +1871,15 @@ msgstr "Ignorar"
 msgid "Recent activity"
 msgstr "Actividad reciente"
 
-#: ../../Zotlabs/Module/Connections.php:302 ../../include/text.php:834
-#: ../../include/nav.php:186
+#: ../../Zotlabs/Module/Connections.php:302 ../../include/nav.php:186
+#: ../../include/text.php:863 ../../include/apps.php:159
 msgid "Connections"
 msgstr "Conexiones"
 
 #: ../../Zotlabs/Module/Connections.php:306 ../../Zotlabs/Module/Search.php:44
-#: ../../include/text.php:904 ../../include/text.php:916
-#: ../../include/apps.php:147 ../../include/nav.php:165
+#: ../../include/acl_selectors.php:278 ../../include/nav.php:165
+#: ../../include/text.php:933 ../../include/text.php:945
+#: ../../include/apps.php:179
 msgid "Search"
 msgstr "Buscar"
 
@@ -1839,8 +1935,8 @@ msgstr "No ha sido posible establecer los parámetros de la libreta de direccion
 msgid "Connection has been removed."
 msgstr "La conexión ha sido eliminada."
 
-#: ../../Zotlabs/Module/Connedit.php:520 ../../include/conversation.php:959
-#: ../../include/nav.php:86
+#: ../../Zotlabs/Module/Connedit.php:520 ../../include/nav.php:86
+#: ../../include/conversation.php:959 ../../include/apps.php:170
 msgid "View Profile"
 msgstr "Ver el perfil"
 
@@ -1922,24 +2018,24 @@ msgstr "¡Esta conexión está oculta!"
 msgid "Delete this connection"
 msgstr "Eliminar esta conexión"
 
-#: ../../Zotlabs/Module/Connedit.php:593 ../../include/widgets.php:444
+#: ../../Zotlabs/Module/Connedit.php:593 ../../include/widgets.php:493
 msgid "Me"
 msgstr "Yo"
 
-#: ../../Zotlabs/Module/Connedit.php:594 ../../include/widgets.php:445
+#: ../../Zotlabs/Module/Connedit.php:594 ../../include/widgets.php:494
 msgid "Family"
 msgstr "Familia"
 
-#: ../../Zotlabs/Module/Connedit.php:595 ../../Zotlabs/Module/Settings.php:340
-#: ../../Zotlabs/Module/Settings.php:344 ../../Zotlabs/Module/Settings.php:345
-#: ../../Zotlabs/Module/Settings.php:348 ../../Zotlabs/Module/Settings.php:359
+#: ../../Zotlabs/Module/Connedit.php:595 ../../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/identity.php:389 ../../include/identity.php:390
 #: ../../include/identity.php:397 ../../include/profile_selectors.php:80
-#: ../../include/widgets.php:446
+#: ../../include/widgets.php:495
 msgid "Friends"
 msgstr "Amigos/as"
 
-#: ../../Zotlabs/Module/Connedit.php:596 ../../include/widgets.php:447
+#: ../../Zotlabs/Module/Connedit.php:596 ../../include/widgets.php:496
 msgid "Acquaintances"
 msgstr "Conocidos/as"
 
@@ -1967,11 +2063,11 @@ msgstr "Ajustar la afinidad y el perfil"
 msgid "none"
 msgstr "-"
 
-#: ../../Zotlabs/Module/Connedit.php:705 ../../include/widgets.php:565
+#: ../../Zotlabs/Module/Connedit.php:705 ../../include/widgets.php:614
 msgid "Connection Default Permissions"
 msgstr "Permisos predeterminados de conexión"
 
-#: ../../Zotlabs/Module/Connedit.php:705 ../../include/items.php:5159
+#: ../../Zotlabs/Module/Connedit.php:705 ../../include/items.php:3927
 #, php-format
 msgid "Connection: %s"
 msgstr "Conexión: %s"
@@ -2118,30 +2214,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:5587
+#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4271
 msgid "female"
 msgstr "mujer"
 
-#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:5588
+#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4272
 #, 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:5589
+#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:4273
 msgid "male"
 msgstr "hombre"
 
-#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:5590
+#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4274
 #, 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:5592
+#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4276
 #, 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:1800
+#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/identity.php:1807
 msgid "cover photo"
 msgstr "Imagen de portada del perfil"
 
@@ -2168,7 +2264,7 @@ msgstr "Subir imagen de portada del perfil"
 
 #: ../../Zotlabs/Module/Cover_photo.php:361
 #: ../../Zotlabs/Module/Profile_photo.php:374
-#: ../../Zotlabs/Module/Settings.php:983
+#: ../../Zotlabs/Module/Settings.php:985
 msgid "or"
 msgstr "o"
 
@@ -2197,12 +2293,8 @@ msgstr "Por favor ajuste el recorte de la imagen para una visión óptima."
 msgid "Done Editing"
 msgstr "Edición completada"
 
-#: ../../Zotlabs/Module/Dav.php:127
-msgid "$Projectname channel"
-msgstr "Canal $Projectname"
-
 #: ../../Zotlabs/Module/Directory.php:63 ../../Zotlabs/Module/Display.php:21
-#: ../../Zotlabs/Module/Photos.php:521 ../../Zotlabs/Module/Ratings.php:86
+#: ../../Zotlabs/Module/Photos.php:522 ../../Zotlabs/Module/Ratings.php:86
 #: ../../Zotlabs/Module/Search.php:17
 #: ../../Zotlabs/Module/Viewconnections.php:21
 msgid "Public access denied."
@@ -2227,13 +2319,13 @@ msgstr "Estado:"
 msgid "Homepage: "
 msgstr "Página personal:"
 
-#: ../../Zotlabs/Module/Directory.php:306 ../../include/identity.php:1322
+#: ../../Zotlabs/Module/Directory.php:306 ../../include/identity.php:1329
 msgid "Age:"
 msgstr "Edad:"
 
-#: ../../Zotlabs/Module/Directory.php:311 ../../include/identity.php:1022
-#: ../../include/text.php:1452 ../../include/bb2diaspora.php:509
-#: ../../include/event.php:52
+#: ../../Zotlabs/Module/Directory.php:311 ../../include/identity.php:1029
+#: ../../include/event.php:52 ../../include/text.php:1481
+#: ../../include/bb2diaspora.php:509
 msgid "Location:"
 msgstr "Ubicación:"
 
@@ -2241,18 +2333,18 @@ msgstr "Ubicación:"
 msgid "Description:"
 msgstr "Descripción:"
 
-#: ../../Zotlabs/Module/Directory.php:322 ../../include/identity.php:1338
+#: ../../Zotlabs/Module/Directory.php:322 ../../include/identity.php:1345
 msgid "Hometown:"
 msgstr "Lugar de nacimiento:"
 
-#: ../../Zotlabs/Module/Directory.php:324 ../../include/identity.php:1346
+#: ../../Zotlabs/Module/Directory.php:324 ../../include/identity.php:1353
 msgid "About:"
 msgstr "Sobre mí:"
 
 #: ../../Zotlabs/Module/Directory.php:325 ../../Zotlabs/Module/Match.php:68
-#: ../../Zotlabs/Module/Suggest.php:56 ../../include/identity.php:1007
-#: ../../include/conversation.php:961 ../../include/Contact.php:101
+#: ../../Zotlabs/Module/Suggest.php:56 ../../include/identity.php:1014
 #: ../../include/widgets.php:147 ../../include/widgets.php:184
+#: ../../include/Contact.php:101 ../../include/conversation.php:961
 msgid "Connect"
 msgstr "Conectar"
 
@@ -2332,7 +2424,7 @@ 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:423
+#: ../../Zotlabs/Module/Subthread.php:62 ../../include/items.php:383
 #: ../../index.php:173
 msgid "Permission denied"
 msgstr "Permiso denegado"
@@ -2394,174 +2486,31 @@ msgstr "se ha recibido mensaje duplicado"
 msgid "mail delivered"
 msgstr "correo enviado"
 
-#: ../../Zotlabs/Module/Editblock.php:82 ../../Zotlabs/Module/Editblock.php:98
-#: ../../Zotlabs/Module/Editlayout.php:80 ../../Zotlabs/Module/Editpost.php:24
+#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95
+#: ../../Zotlabs/Module/Editlayout.php:79 ../../Zotlabs/Module/Editpost.php:24
 #: ../../Zotlabs/Module/Editwebpage.php:81
 msgid "Item not found"
 msgstr "Elemento no encontrado"
 
-#: ../../Zotlabs/Module/Editblock.php:122
-msgid "Delete block?"
-msgstr "¿Borrar bloque?"
-
-#: ../../Zotlabs/Module/Editblock.php:141
-#: ../../Zotlabs/Module/Editlayout.php:140
-#: ../../Zotlabs/Module/Editpost.php:119
-#: ../../Zotlabs/Module/Editwebpage.php:182 ../../include/ItemObject.php:704
-#: ../../include/conversation.php:1216
-msgid "Bold"
-msgstr "Negrita"
-
-#: ../../Zotlabs/Module/Editblock.php:142
-#: ../../Zotlabs/Module/Editlayout.php:141
-#: ../../Zotlabs/Module/Editpost.php:120
-#: ../../Zotlabs/Module/Editwebpage.php:183 ../../include/ItemObject.php:705
-#: ../../include/conversation.php:1217
-msgid "Italic"
-msgstr "Itálico "
-
-#: ../../Zotlabs/Module/Editblock.php:143
-#: ../../Zotlabs/Module/Editlayout.php:142
-#: ../../Zotlabs/Module/Editpost.php:121
-#: ../../Zotlabs/Module/Editwebpage.php:184 ../../include/ItemObject.php:706
-#: ../../include/conversation.php:1218
-msgid "Underline"
-msgstr "Subrayar"
-
-#: ../../Zotlabs/Module/Editblock.php:144
-#: ../../Zotlabs/Module/Editlayout.php:143
-#: ../../Zotlabs/Module/Editpost.php:122
-#: ../../Zotlabs/Module/Editwebpage.php:185 ../../include/ItemObject.php:707
-#: ../../include/conversation.php:1219
-msgid "Quote"
-msgstr "Citar"
-
-#: ../../Zotlabs/Module/Editblock.php:145
-#: ../../Zotlabs/Module/Editlayout.php:144
-#: ../../Zotlabs/Module/Editpost.php:123
-#: ../../Zotlabs/Module/Editwebpage.php:186 ../../include/ItemObject.php:708
-#: ../../include/conversation.php:1220
-msgid "Code"
-msgstr "Código"
-
-#: ../../Zotlabs/Module/Editblock.php:147
-#: ../../Zotlabs/Module/Editlayout.php:146
-#: ../../Zotlabs/Module/Editpost.php:125
-#: ../../Zotlabs/Module/Editwebpage.php:187 ../../Zotlabs/Module/Mail.php:252
-#: ../../Zotlabs/Module/Mail.php:382 ../../include/conversation.php:1223
-msgid "Attach file"
-msgstr "Adjuntar fichero"
-
-#: ../../Zotlabs/Module/Editblock.php:151
-#: ../../Zotlabs/Module/Editlayout.php:154
-#: ../../Zotlabs/Module/Editpost.php:136
-#: ../../Zotlabs/Module/Editwebpage.php:191
-#: ../../Zotlabs/Module/Events.php:470 ../../include/conversation.php:1245
-msgid "Permission settings"
-msgstr "Configuración de permisos"
-
-#: ../../Zotlabs/Module/Editblock.php:159
-#: ../../Zotlabs/Module/Editlayout.php:161
-#: ../../Zotlabs/Module/Editpost.php:144
-#: ../../Zotlabs/Module/Editwebpage.php:200
-#: ../../include/conversation.php:1254
-msgid "Public post"
-msgstr "Entrada pública"
-
-#: ../../Zotlabs/Module/Editblock.php:162
-#: ../../Zotlabs/Module/Editpost.php:147
-#: ../../Zotlabs/Module/Editwebpage.php:205
-#: ../../include/conversation.php:1239
+#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1234
 msgid "Title (optional)"
 msgstr "Título (opcional)"
 
-#: ../../Zotlabs/Module/Editblock.php:165
-#: ../../Zotlabs/Module/Editlayout.php:168
-#: ../../Zotlabs/Module/Editpost.php:149
-#: ../../Zotlabs/Module/Editwebpage.php:207
-#: ../../include/conversation.php:1243
-msgid "Categories (optional, comma-separated list)"
-msgstr "Categorías (opcional, lista separada por comas)"
-
-#: ../../Zotlabs/Module/Editblock.php:166
-#: ../../Zotlabs/Module/Editlayout.php:169
-#: ../../Zotlabs/Module/Editpost.php:150
-#: ../../Zotlabs/Module/Editwebpage.php:208
-#: ../../include/conversation.php:1256
-msgid "Example: bob@example.com, mary@example.com"
-msgstr "Ejemplo: roberto@ejemplo.com, maría@ejemplo.com"
-
-#: ../../Zotlabs/Module/Editblock.php:171
-#: ../../Zotlabs/Module/Editpost.php:155
-#: ../../Zotlabs/Module/Editwebpage.php:212
-#: ../../Zotlabs/Module/Events.php:469 ../../Zotlabs/Module/Photos.php:1092
-#: ../../Zotlabs/Module/Webpages.php:196 ../../include/ItemObject.php:712
-#: ../../include/conversation.php:1186 ../../include/page_widgets.php:40
-msgid "Preview"
-msgstr "Previsualizar"
-
-#: ../../Zotlabs/Module/Editblock.php:179
+#: ../../Zotlabs/Module/Editblock.php:133
 msgid "Edit Block"
 msgstr "Modificar este bloque"
 
-#: ../../Zotlabs/Module/Editlayout.php:116
-msgid "Delete layout?"
-msgstr "¿Borrar la plantilla?"
-
-#: ../../Zotlabs/Module/Editlayout.php:145
-#: ../../Zotlabs/Module/Editpost.php:124 ../../include/conversation.php:1221
-msgid "Upload photo"
-msgstr "Subir foto"
-
-#: ../../Zotlabs/Module/Editlayout.php:148
-#: ../../Zotlabs/Module/Editpost.php:127
-msgid "Insert YouTube video"
-msgstr "Insertar vídeo de YouTube"
-
-#: ../../Zotlabs/Module/Editlayout.php:149
-#: ../../Zotlabs/Module/Editpost.php:128
-msgid "Insert Vorbis [.ogg] video"
-msgstr "Insertar vídeo Vorbis [.ogg]"
-
-#: ../../Zotlabs/Module/Editlayout.php:150
-#: ../../Zotlabs/Module/Editpost.php:129
-msgid "Insert Vorbis [.ogg] audio"
-msgstr "Insertar audio Vorbis [.ogg]"
-
-#: ../../Zotlabs/Module/Editlayout.php:151
-#: ../../Zotlabs/Module/Editpost.php:130 ../../include/conversation.php:1231
-msgid "Set your location"
-msgstr "Establecer su ubicación"
-
-#: ../../Zotlabs/Module/Editlayout.php:152
-#: ../../Zotlabs/Module/Editpost.php:131 ../../include/conversation.php:1236
-msgid "Clear browser location"
-msgstr "Eliminar los datos de localización geográfica del navegador"
-
-#: ../../Zotlabs/Module/Editlayout.php:153
-#: ../../Zotlabs/Module/Editpost.php:135 ../../Zotlabs/Module/Photos.php:1072
-#: ../../include/ItemObject.php:389 ../../include/conversation.php:740
-#: ../../include/conversation.php:1244
-msgid "Please wait"
-msgstr "Espere por favor"
-
-#: ../../Zotlabs/Module/Editlayout.php:164
-#: ../../Zotlabs/Module/Layouts.php:128
-msgid "Layout Description (Optional)"
-msgstr "Descripción de la plantilla (opcional)"
-
-#: ../../Zotlabs/Module/Editlayout.php:166
-#: ../../Zotlabs/Module/Layouts.php:125 ../../Zotlabs/Module/Layouts.php:184
+#: ../../Zotlabs/Module/Editlayout.php:126
+#: ../../Zotlabs/Module/Layouts.php:127 ../../Zotlabs/Module/Layouts.php:186
 msgid "Layout Name"
 msgstr "Nombre de la plantilla"
 
-#: ../../Zotlabs/Module/Editlayout.php:178
-#: ../../Zotlabs/Module/Editpost.php:161 ../../Zotlabs/Module/Mail.php:257
-#: ../../Zotlabs/Module/Mail.php:387 ../../include/conversation.php:1269
-msgid "Set expiration date"
-msgstr "Configurar fecha de caducidad"
+#: ../../Zotlabs/Module/Editlayout.php:127
+#: ../../Zotlabs/Module/Layouts.php:130
+msgid "Layout Description (Optional)"
+msgstr "Descripción de la plantilla (opcional)"
 
-#: ../../Zotlabs/Module/Editlayout.php:183
+#: ../../Zotlabs/Module/Editlayout.php:135
 msgid "Edit Layout"
 msgstr "Modificar la plantilla"
 
@@ -2569,171 +2518,153 @@ msgstr "Modificar la plantilla"
 msgid "Item is not editable"
 msgstr "El elemento no es editable"
 
-#: ../../Zotlabs/Module/Editpost.php:60 ../../Zotlabs/Module/Mail.php:207
-#: ../../Zotlabs/Module/Mail.php:321 ../../include/conversation.php:1176
-msgid "Expires YYYY-MM-DD HH:MM"
-msgstr "Caduca YYYY-MM-DD HH:MM"
-
-#: ../../Zotlabs/Module/Editpost.php:61
-msgid "Delete item?"
-msgstr "¿Borrar elemento?"
-
-#: ../../Zotlabs/Module/Editpost.php:132 ../../include/conversation.php:1233
-msgid "Toggle voting"
-msgstr "Cambiar votación"
-
-#: ../../Zotlabs/Module/Editpost.php:165 ../../include/conversation.php:1276
-msgid "OK"
-msgstr "OK"
-
-#: ../../Zotlabs/Module/Editpost.php:166 ../../Zotlabs/Module/Fbrowser.php:66
-#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Settings.php:589
-#: ../../Zotlabs/Module/Settings.php:615 ../../Zotlabs/Module/Tagrm.php:15
-#: ../../Zotlabs/Module/Tagrm.php:138 ../../include/conversation.php:1277
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: ../../Zotlabs/Module/Editpost.php:171 ../../Zotlabs/Module/Rpost.php:134
+#: ../../Zotlabs/Module/Editpost.php:106 ../../Zotlabs/Module/Rpost.php:135
 msgid "Edit post"
 msgstr "Editar la entrada"
 
-#: ../../Zotlabs/Module/Editwebpage.php:157
-msgid "Delete webpage?"
-msgstr "¿Eliminar la página web?"
+#: ../../Zotlabs/Module/Editwebpage.php:143
+msgid "Page link"
+msgstr "Enlace de la página"
 
-#: ../../Zotlabs/Module/Editwebpage.php:177
-msgid "Page link title"
-msgstr "Título del enlace de la página"
-
-#: ../../Zotlabs/Module/Editwebpage.php:220
+#: ../../Zotlabs/Module/Editwebpage.php:169
 msgid "Edit Webpage"
 msgstr "Editar la página web"
 
-#: ../../Zotlabs/Module/Events.php:25
+#: ../../Zotlabs/Module/Events.php:26
 msgid "Calendar entries imported."
 msgstr "Entradas de calendario importadas."
 
-#: ../../Zotlabs/Module/Events.php:27
+#: ../../Zotlabs/Module/Events.php:28
 msgid "No calendar entries found."
 msgstr "No se han encontrado entradas de calendario."
 
-#: ../../Zotlabs/Module/Events.php:104
+#: ../../Zotlabs/Module/Events.php:105
 msgid "Event can not end before it has started."
 msgstr "Un evento no puede terminar antes de que haya comenzado."
 
-#: ../../Zotlabs/Module/Events.php:106 ../../Zotlabs/Module/Events.php:115
-#: ../../Zotlabs/Module/Events.php:135
+#: ../../Zotlabs/Module/Events.php:107 ../../Zotlabs/Module/Events.php:116
+#: ../../Zotlabs/Module/Events.php:136
 msgid "Unable to generate preview."
 msgstr "No se puede crear la vista previa."
 
-#: ../../Zotlabs/Module/Events.php:113
+#: ../../Zotlabs/Module/Events.php:114
 msgid "Event title and start time are required."
 msgstr "Se requieren el título del evento y su hora de inicio."
 
-#: ../../Zotlabs/Module/Events.php:133 ../../Zotlabs/Module/Events.php:258
+#: ../../Zotlabs/Module/Events.php:134 ../../Zotlabs/Module/Events.php:259
 msgid "Event not found."
 msgstr "Evento no encontrado."
 
-#: ../../Zotlabs/Module/Events.php:253 ../../Zotlabs/Module/Like.php:373
-#: ../../Zotlabs/Module/Tagger.php:51 ../../include/text.php:1943
-#: ../../include/conversation.php:123 ../../include/event.php:915
+#: ../../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
 msgid "event"
 msgstr "evento"
 
-#: ../../Zotlabs/Module/Events.php:448
+#: ../../Zotlabs/Module/Events.php:449
 msgid "Edit event title"
 msgstr "Editar el título del evento"
 
-#: ../../Zotlabs/Module/Events.php:448
+#: ../../Zotlabs/Module/Events.php:449
 msgid "Event title"
 msgstr "Título del evento"
 
-#: ../../Zotlabs/Module/Events.php:450
+#: ../../Zotlabs/Module/Events.php:451
 msgid "Categories (comma-separated list)"
 msgstr "Categorías (lista separada por comas)"
 
-#: ../../Zotlabs/Module/Events.php:451
+#: ../../Zotlabs/Module/Events.php:452
 msgid "Edit Category"
 msgstr "Editar la categoría"
 
-#: ../../Zotlabs/Module/Events.php:451
+#: ../../Zotlabs/Module/Events.php:452
 msgid "Category"
 msgstr "Categoría"
 
-#: ../../Zotlabs/Module/Events.php:454
+#: ../../Zotlabs/Module/Events.php:455
 msgid "Edit start date and time"
 msgstr "Modificar la fecha y hora de comienzo"
 
-#: ../../Zotlabs/Module/Events.php:454
+#: ../../Zotlabs/Module/Events.php:455
 msgid "Start date and time"
 msgstr "Fecha y hora de comienzo"
 
-#: ../../Zotlabs/Module/Events.php:455 ../../Zotlabs/Module/Events.php:458
+#: ../../Zotlabs/Module/Events.php:456 ../../Zotlabs/Module/Events.php:459
 msgid "Finish date and time are not known or not relevant"
 msgstr "La fecha y hora de terminación no se conocen o no son relevantes"
 
-#: ../../Zotlabs/Module/Events.php:457
+#: ../../Zotlabs/Module/Events.php:458
 msgid "Edit finish date and time"
 msgstr "Modificar la fecha y hora de terminación"
 
-#: ../../Zotlabs/Module/Events.php:457
+#: ../../Zotlabs/Module/Events.php:458
 msgid "Finish date and time"
 msgstr "Fecha y hora de terminación"
 
-#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:460
+#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:461
 msgid "Adjust for viewer timezone"
 msgstr "Ajustar para obtener el visor de los husos horarios"
 
-#: ../../Zotlabs/Module/Events.php:459
+#: ../../Zotlabs/Module/Events.php:460
 msgid ""
 "Important for events that happen in a particular place. Not practical for "
 "global holidays."
 msgstr "Importante para los eventos que suceden en un lugar determinado. No es práctico para los globales."
 
-#: ../../Zotlabs/Module/Events.php:461
+#: ../../Zotlabs/Module/Events.php:462
 msgid "Edit Description"
 msgstr "Editar la descripción"
 
-#: ../../Zotlabs/Module/Events.php:463
+#: ../../Zotlabs/Module/Events.php:464
 msgid "Edit Location"
 msgstr "Modificar la dirección"
 
-#: ../../Zotlabs/Module/Events.php:463 ../../Zotlabs/Module/Locs.php:117
+#: ../../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
 msgid "Location"
 msgstr "Ubicación"
 
-#: ../../Zotlabs/Module/Events.php:466 ../../Zotlabs/Module/Events.php:468
+#: ../../Zotlabs/Module/Events.php:467 ../../Zotlabs/Module/Events.php:469
 msgid "Share this event"
 msgstr "Compartir este evento"
 
-#: ../../Zotlabs/Module/Events.php:473
+#: ../../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
+msgid "Preview"
+msgstr "Previsualizar"
+
+#: ../../Zotlabs/Module/Events.php:471 ../../include/conversation.php:1238
+msgid "Permission settings"
+msgstr "Configuración de permisos"
+
+#: ../../Zotlabs/Module/Events.php:476
 msgid "Advanced Options"
 msgstr "Opciones avanzadas"
 
-#: ../../Zotlabs/Module/Events.php:607
+#: ../../Zotlabs/Module/Events.php:610
 msgid "Edit event"
 msgstr "Editar evento"
 
-#: ../../Zotlabs/Module/Events.php:609
+#: ../../Zotlabs/Module/Events.php:612
 msgid "Delete event"
 msgstr "Borrar evento"
 
-#: ../../Zotlabs/Module/Events.php:643
+#: ../../Zotlabs/Module/Events.php:646
 msgid "calendar"
 msgstr "calendario"
 
-#: ../../Zotlabs/Module/Events.php:703
+#: ../../Zotlabs/Module/Events.php:706
 msgid "Event removed"
 msgstr "Evento borrado"
 
-#: ../../Zotlabs/Module/Events.php:706
+#: ../../Zotlabs/Module/Events.php:709
 msgid "Failed to remove event"
 msgstr "Error al eliminar el evento"
 
-#: ../../Zotlabs/Module/Fbrowser.php:29 ../../include/apps.php:139
-#: ../../include/conversation.php:1650 ../../include/nav.php:92
+#: ../../Zotlabs/Module/Fbrowser.php:29 ../../include/nav.php:92
+#: ../../include/conversation.php:1638 ../../include/apps.php:171
 msgid "Photos"
 msgstr "Fotos"
 
@@ -2745,7 +2676,7 @@ msgstr "Compartir contenido desde Firefox a $Projectname"
 msgid "Activate the Firefox $Projectname provider"
 msgstr "Servicio de compartición de Firefox: activar el proveedor $Projectname "
 
-#: ../../Zotlabs/Module/Filer.php:52 ../../include/conversation.php:1174
+#: ../../Zotlabs/Module/Filer.php:52
 msgid "Save to Folder:"
 msgstr "Guardar en carpeta:"
 
@@ -2753,51 +2684,51 @@ msgstr "Guardar en carpeta:"
 msgid "- select -"
 msgstr "- seleccionar -"
 
-#: ../../Zotlabs/Module/Filestorage.php:86
+#: ../../Zotlabs/Module/Filestorage.php:88
 msgid "Permission Denied."
 msgstr "Permiso denegado"
 
-#: ../../Zotlabs/Module/Filestorage.php:102
+#: ../../Zotlabs/Module/Filestorage.php:104
 msgid "File not found."
 msgstr "Fichero no encontrado."
 
-#: ../../Zotlabs/Module/Filestorage.php:145
+#: ../../Zotlabs/Module/Filestorage.php:147
 msgid "Edit file permissions"
 msgstr "Modificar los permisos del fichero"
 
-#: ../../Zotlabs/Module/Filestorage.php:154
+#: ../../Zotlabs/Module/Filestorage.php:156
 msgid "Set/edit permissions"
 msgstr "Establecer/editar los permisos"
 
-#: ../../Zotlabs/Module/Filestorage.php:155
+#: ../../Zotlabs/Module/Filestorage.php:157
 msgid "Include all files and sub folders"
 msgstr "Incluir todos los ficheros y subcarpetas"
 
-#: ../../Zotlabs/Module/Filestorage.php:156
+#: ../../Zotlabs/Module/Filestorage.php:158
 msgid "Return to file list"
 msgstr "Volver a la lista de ficheros"
 
-#: ../../Zotlabs/Module/Filestorage.php:158
+#: ../../Zotlabs/Module/Filestorage.php:160
 msgid "Copy/paste this code to attach file to a post"
 msgstr "Copiar/pegar este código para adjuntar el fichero al envío"
 
-#: ../../Zotlabs/Module/Filestorage.php:159
+#: ../../Zotlabs/Module/Filestorage.php:161
 msgid "Copy/paste this URL to link file from a web page"
 msgstr "Copiar/pegar esta dirección para enlazar el fichero desde una página web"
 
-#: ../../Zotlabs/Module/Filestorage.php:161
+#: ../../Zotlabs/Module/Filestorage.php:163
 msgid "Share this file"
 msgstr "Compartir este fichero"
 
-#: ../../Zotlabs/Module/Filestorage.php:162
+#: ../../Zotlabs/Module/Filestorage.php:164
 msgid "Show URL to this file"
 msgstr "Mostrar la dirección de este fichero"
 
-#: ../../Zotlabs/Module/Filestorage.php:163
+#: ../../Zotlabs/Module/Filestorage.php:165
 msgid "Notify your contacts about this file"
 msgstr "Avisar a sus contactos sobre este fichero"
 
-#: ../../Zotlabs/Module/Follow.php:31
+#: ../../Zotlabs/Module/Follow.php:34
 msgid "Channel added."
 msgstr "Canal añadido."
 
@@ -2827,7 +2758,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:5126
+#: ../../include/items.php:3894
 msgid "Privacy group not found."
 msgstr "Grupo de canales no encontrado."
 
@@ -2881,8 +2812,8 @@ msgid "Help:"
 msgstr "Ayuda:"
 
 #: ../../Zotlabs/Module/Help.php:85 ../../Zotlabs/Module/Help.php:90
-#: ../../Zotlabs/Module/Layouts.php:181 ../../include/apps.php:142
-#: ../../include/nav.php:159
+#: ../../Zotlabs/Module/Layouts.php:183 ../../include/nav.php:159
+#: ../../include/apps.php:174
 msgid "Help"
 msgstr "Ayuda"
 
@@ -2917,7 +2848,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:155
+#: ../../Zotlabs/Module/Id.php:21 ../../include/apps.php:187
 msgid "Profile Photo"
 msgstr "Foto del perfil"
 
@@ -2953,7 +2884,7 @@ msgstr "Huso horario"
 msgid "Homepage URL"
 msgstr "Dirección de la página personal"
 
-#: ../../Zotlabs/Module/Id.php:30 ../../include/apps.php:153
+#: ../../Zotlabs/Module/Id.php:30 ../../include/apps.php:185
 msgid "Language"
 msgstr "Idioma"
 
@@ -3037,7 +2968,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:80
+#: ../../Zotlabs/Module/Import.php:150 ../../include/import.php:84
 msgid "Cloned channel not found. Import failed."
 msgstr "No se ha podido importar el canal porque el canal clonado no se ha encontrado."
 
@@ -3227,19 +3158,19 @@ 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:179 ../../include/text.php:2253
+#: ../../Zotlabs/Module/Layouts.php:181 ../../include/text.php:2279
 msgid "Layouts"
 msgstr "Plantillas"
 
-#: ../../Zotlabs/Module/Layouts.php:181
+#: ../../Zotlabs/Module/Layouts.php:183
 msgid "Comanche page description language help"
 msgstr "Página de ayuda del lenguaje de descripción de páginas (PDL) Comanche"
 
-#: ../../Zotlabs/Module/Layouts.php:185
+#: ../../Zotlabs/Module/Layouts.php:187
 msgid "Layout Description"
 msgstr "Descripción de la plantilla"
 
-#: ../../Zotlabs/Module/Layouts.php:190
+#: ../../Zotlabs/Module/Layouts.php:192
 msgid "Download PDL file"
 msgstr "Descargar el fichero PDL"
 
@@ -3279,13 +3210,13 @@ msgid "Previous action reversed."
 msgstr "Acción anterior revocada."
 
 #: ../../Zotlabs/Module/Like.php:371 ../../Zotlabs/Module/Subthread.php:87
-#: ../../Zotlabs/Module/Tagger.php:47 ../../include/text.php:1940
-#: ../../include/conversation.php:120
+#: ../../Zotlabs/Module/Tagger.php:47 ../../include/conversation.php:120
+#: ../../include/text.php:1952
 msgid "photo"
 msgstr "foto"
 
 #: ../../Zotlabs/Module/Like.php:371 ../../Zotlabs/Module/Subthread.php:87
-#: ../../include/text.php:1946 ../../include/conversation.php:148
+#: ../../include/conversation.php:148 ../../include/text.php:1958
 msgid "status"
 msgstr "el mensaje de estado"
 
@@ -3502,6 +3433,10 @@ msgstr "Mensaje revocado."
 msgid "Conversation removed."
 msgstr "Conversación eliminada."
 
+#: ../../Zotlabs/Module/Mail.php:207 ../../Zotlabs/Module/Mail.php:321
+msgid "Expires YYYY-MM-DD HH:MM"
+msgstr "Caduca YYYY-MM-DD HH:MM"
+
 #: ../../Zotlabs/Module/Mail.php:235
 msgid "Requested channel is not in this network"
 msgstr "El canal solicitado no existe en esta red"
@@ -3518,10 +3453,20 @@ msgstr "Para:"
 msgid "Subject:"
 msgstr "Asunto:"
 
+#: ../../Zotlabs/Module/Mail.php:252 ../../Zotlabs/Module/Mail.php:382
+#: ../../include/conversation.php:1226
+msgid "Attach file"
+msgstr "Adjuntar fichero"
+
 #: ../../Zotlabs/Module/Mail.php:254
 msgid "Send"
 msgstr "Enviar"
 
+#: ../../Zotlabs/Module/Mail.php:257 ../../Zotlabs/Module/Mail.php:387
+#: ../../include/conversation.php:1257
+msgid "Set expiration date"
+msgstr "Configurar fecha de caducidad"
+
 #: ../../Zotlabs/Module/Mail.php:346
 msgid "Delete message"
 msgstr "Borrar mensaje"
@@ -3557,48 +3502,48 @@ msgstr "Responder"
 msgid "Your message for %s (%s):"
 msgstr "Su mensaje para %s (%s):"
 
-#: ../../Zotlabs/Module/Manage.php:134
+#: ../../Zotlabs/Module/Manage.php:136
 #: ../../Zotlabs/Module/New_channel.php:121
 #, php-format
 msgid "You have created %1$.0f of %2$.0f allowed channels."
 msgstr "Ha creado %1$.0f de %2$.0f canales permitidos."
 
-#: ../../Zotlabs/Module/Manage.php:141
+#: ../../Zotlabs/Module/Manage.php:143
 msgid "Create a new channel"
 msgstr "Crear un nuevo canal"
 
-#: ../../Zotlabs/Module/Manage.php:162 ../../include/apps.php:132
-#: ../../include/nav.php:206
+#: ../../Zotlabs/Module/Manage.php:164 ../../include/nav.php:206
+#: ../../include/apps.php:164
 msgid "Channel Manager"
 msgstr "Administración de canales"
 
-#: ../../Zotlabs/Module/Manage.php:163
+#: ../../Zotlabs/Module/Manage.php:165
 msgid "Current Channel"
 msgstr "Canal actual"
 
-#: ../../Zotlabs/Module/Manage.php:165
+#: ../../Zotlabs/Module/Manage.php:167
 msgid "Switch to one of your channels by selecting it."
 msgstr "Cambiar a uno de sus canales seleccionándolo."
 
-#: ../../Zotlabs/Module/Manage.php:166
+#: ../../Zotlabs/Module/Manage.php:168
 msgid "Default Channel"
 msgstr "Canal principal"
 
-#: ../../Zotlabs/Module/Manage.php:167
+#: ../../Zotlabs/Module/Manage.php:169
 msgid "Make Default"
 msgstr "Convertir en predeterminado"
 
-#: ../../Zotlabs/Module/Manage.php:170
+#: ../../Zotlabs/Module/Manage.php:172
 #, php-format
 msgid "%d new messages"
 msgstr "%d mensajes nuevos"
 
-#: ../../Zotlabs/Module/Manage.php:171
+#: ../../Zotlabs/Module/Manage.php:173
 #, php-format
 msgid "%d new introductions"
 msgstr "%d nuevas isolicitudes de conexión"
 
-#: ../../Zotlabs/Module/Manage.php:173
+#: ../../Zotlabs/Module/Manage.php:175
 msgid "Delegated Channel"
 msgstr "Canal delegado"
 
@@ -3654,7 +3599,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:2252
+#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2278
 msgid "Menus"
 msgstr "Menús"
 
@@ -3732,7 +3677,7 @@ msgid "Menu Item Permissions"
 msgstr "Permisos del elemento del menú"
 
 #: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:227
-#: ../../Zotlabs/Module/Settings.php:1066
+#: ../../Zotlabs/Module/Settings.php:1068
 msgid "(click to open/close)"
 msgstr "(pulsar para abrir o cerrar)"
 
@@ -3838,7 +3783,7 @@ msgctxt "mood"
 msgid "%1$s is %2$s"
 msgstr "%1$s está %2$s"
 
-#: ../../Zotlabs/Module/Mood.php:135 ../../include/apps.php:144
+#: ../../Zotlabs/Module/Mood.php:135 ../../include/apps.php:176
 msgid "Mood"
 msgstr "Estado de ánimo"
 
@@ -3846,31 +3791,31 @@ msgstr "Estado de ánimo"
 msgid "Set your current mood and tell your friends"
 msgstr "Describir su estado de ánimo para comunicárselo a sus amigos"
 
-#: ../../Zotlabs/Module/Network.php:95
+#: ../../Zotlabs/Module/Network.php:96
 msgid "No such group"
 msgstr "No se encuentra el grupo"
 
-#: ../../Zotlabs/Module/Network.php:135
+#: ../../Zotlabs/Module/Network.php:136
 msgid "No such channel"
 msgstr "No se encuentra el  canal"
 
-#: ../../Zotlabs/Module/Network.php:140
+#: ../../Zotlabs/Module/Network.php:141
 msgid "forum"
 msgstr "foro"
 
-#: ../../Zotlabs/Module/Network.php:152
+#: ../../Zotlabs/Module/Network.php:153
 msgid "Search Results For:"
 msgstr "Buscar resultados para:"
 
-#: ../../Zotlabs/Module/Network.php:216
+#: ../../Zotlabs/Module/Network.php:217
 msgid "Privacy group is empty"
 msgstr "El grupo de canales está vacío"
 
-#: ../../Zotlabs/Module/Network.php:225
+#: ../../Zotlabs/Module/Network.php:226
 msgid "Privacy group: "
 msgstr "Grupo de canales: "
 
-#: ../../Zotlabs/Module/Network.php:251
+#: ../../Zotlabs/Module/Network.php:252
 msgid "Invalid connection."
 msgstr "Conexión no válida."
 
@@ -4011,11 +3956,11 @@ msgstr "Nombre del módulo:"
 msgid "Layout Help"
 msgstr "Ayuda para el diseño de plantillas de página"
 
-#: ../../Zotlabs/Module/Photos.php:83
+#: ../../Zotlabs/Module/Photos.php:84
 msgid "Page owner information could not be retrieved."
 msgstr "La información del propietario de la página no pudo ser recuperada."
 
-#: ../../Zotlabs/Module/Photos.php:98 ../../Zotlabs/Module/Photos.php:742
+#: ../../Zotlabs/Module/Photos.php:99 ../../Zotlabs/Module/Photos.php:743
 #: ../../Zotlabs/Module/Profile_photo.php:114
 #: ../../Zotlabs/Module/Profile_photo.php:206
 #: ../../Zotlabs/Module/Profile_photo.php:294
@@ -4023,271 +3968,272 @@ msgstr "La información del propietario de la página no pudo ser recuperada."
 msgid "Profile Photos"
 msgstr "Fotos del perfil"
 
-#: ../../Zotlabs/Module/Photos.php:104 ../../Zotlabs/Module/Photos.php:148
+#: ../../Zotlabs/Module/Photos.php:105 ../../Zotlabs/Module/Photos.php:149
 msgid "Album not found."
 msgstr "�lbum no encontrado."
 
-#: ../../Zotlabs/Module/Photos.php:131
+#: ../../Zotlabs/Module/Photos.php:132
 msgid "Delete Album"
 msgstr "Borrar álbum"
 
-#: ../../Zotlabs/Module/Photos.php:152
+#: ../../Zotlabs/Module/Photos.php:153
 msgid ""
 "Multiple storage folders exist with this album name, but within different "
 "directories. Please remove the desired folder or folders using the Files "
 "manager"
 msgstr "Hay varias carpetas con este nombre de álbum, pero dentro de diferentes directorios. Por favor, elimine la carpeta o carpetas que desee utilizando el administrador de ficheros"
 
-#: ../../Zotlabs/Module/Photos.php:209 ../../Zotlabs/Module/Photos.php:1052
+#: ../../Zotlabs/Module/Photos.php:210 ../../Zotlabs/Module/Photos.php:1053
 msgid "Delete Photo"
 msgstr "Borrar foto"
 
-#: ../../Zotlabs/Module/Photos.php:532
+#: ../../Zotlabs/Module/Photos.php:533
 msgid "No photos selected"
 msgstr "No hay fotos seleccionadas"
 
-#: ../../Zotlabs/Module/Photos.php:581
+#: ../../Zotlabs/Module/Photos.php:582
 msgid "Access to this item is restricted."
 msgstr "El acceso a este elemento está restringido."
 
-#: ../../Zotlabs/Module/Photos.php:620
+#: ../../Zotlabs/Module/Photos.php:621
 #, php-format
 msgid "%1$.2f MB of %2$.2f MB photo storage used."
 msgstr "%1$.2f MB de %2$.2f MB de almacenamiento de fotos utilizado."
 
-#: ../../Zotlabs/Module/Photos.php:623
+#: ../../Zotlabs/Module/Photos.php:624
 #, php-format
 msgid "%1$.2f MB photo storage used."
 msgstr "%1$.2f MB de almacenamiento de fotos utilizado."
 
-#: ../../Zotlabs/Module/Photos.php:659
+#: ../../Zotlabs/Module/Photos.php:660
 msgid "Upload Photos"
 msgstr "Subir fotos"
 
-#: ../../Zotlabs/Module/Photos.php:663
+#: ../../Zotlabs/Module/Photos.php:664
 msgid "Enter an album name"
 msgstr "Introducir un nombre de álbum"
 
-#: ../../Zotlabs/Module/Photos.php:664
+#: ../../Zotlabs/Module/Photos.php:665
 msgid "or select an existing album (doubleclick)"
 msgstr "o seleccionar uno existente (doble click)"
 
-#: ../../Zotlabs/Module/Photos.php:665
+#: ../../Zotlabs/Module/Photos.php:666
 msgid "Create a status post for this upload"
 msgstr "Crear un mensaje de estado para esta subida"
 
-#: ../../Zotlabs/Module/Photos.php:666
+#: ../../Zotlabs/Module/Photos.php:667
 msgid "Caption (optional):"
 msgstr "Título (opcional):"
 
-#: ../../Zotlabs/Module/Photos.php:667
+#: ../../Zotlabs/Module/Photos.php:668
 msgid "Description (optional):"
 msgstr "Descripción (opcional):"
 
-#: ../../Zotlabs/Module/Photos.php:694
+#: ../../Zotlabs/Module/Photos.php:695
 msgid "Album name could not be decoded"
 msgstr "El nombre del álbum no ha podido ser descifrado"
 
-#: ../../Zotlabs/Module/Photos.php:742 ../../Zotlabs/Module/Photos.php:1283
-#: ../../Zotlabs/Module/Photos.php:1300
+#: ../../Zotlabs/Module/Photos.php:743 ../../Zotlabs/Module/Photos.php:1284
+#: ../../Zotlabs/Module/Photos.php:1301
 msgid "Contact Photos"
 msgstr "Fotos de contacto"
 
-#: ../../Zotlabs/Module/Photos.php:765
+#: ../../Zotlabs/Module/Photos.php:766
 msgid "Show Newest First"
 msgstr "Mostrar lo más reciente primero"
 
-#: ../../Zotlabs/Module/Photos.php:767
+#: ../../Zotlabs/Module/Photos.php:768
 msgid "Show Oldest First"
 msgstr "Mostrar lo más antiguo primero"
 
-#: ../../Zotlabs/Module/Photos.php:791 ../../Zotlabs/Module/Photos.php:1333
-#: ../../include/widgets.php:1451
+#: ../../Zotlabs/Module/Photos.php:792 ../../Zotlabs/Module/Photos.php:1334
+#: ../../include/widgets.php:1500
 msgid "View Photo"
 msgstr "Ver foto"
 
-#: ../../Zotlabs/Module/Photos.php:822 ../../include/widgets.php:1468
+#: ../../Zotlabs/Module/Photos.php:823 ../../include/widgets.php:1517
 msgid "Edit Album"
 msgstr "Editar álbum"
 
-#: ../../Zotlabs/Module/Photos.php:869
+#: ../../Zotlabs/Module/Photos.php:870
 msgid "Permission denied. Access to this item may be restricted."
 msgstr "Permiso denegado. El acceso a este elemento puede estar restringido."
 
-#: ../../Zotlabs/Module/Photos.php:871
+#: ../../Zotlabs/Module/Photos.php:872
 msgid "Photo not available"
 msgstr "Foto no disponible"
 
-#: ../../Zotlabs/Module/Photos.php:929
+#: ../../Zotlabs/Module/Photos.php:930
 msgid "Use as profile photo"
 msgstr "Usar como foto del perfil"
 
-#: ../../Zotlabs/Module/Photos.php:930
+#: ../../Zotlabs/Module/Photos.php:931
 msgid "Use as cover photo"
 msgstr "Usar como imagen de portada del perfil"
 
-#: ../../Zotlabs/Module/Photos.php:937
+#: ../../Zotlabs/Module/Photos.php:938
 msgid "Private Photo"
 msgstr "Foto privada"
 
-#: ../../Zotlabs/Module/Photos.php:952
+#: ../../Zotlabs/Module/Photos.php:953
 msgid "View Full Size"
 msgstr "Ver tamaño completo"
 
-#: ../../Zotlabs/Module/Photos.php:997 ../../Zotlabs/Module/Tagrm.php:137
-msgid "Remove"
-msgstr "Eliminar"
-
-#: ../../Zotlabs/Module/Photos.php:1031
+#: ../../Zotlabs/Module/Photos.php:1032
 msgid "Edit photo"
 msgstr "Editar foto"
 
-#: ../../Zotlabs/Module/Photos.php:1033
+#: ../../Zotlabs/Module/Photos.php:1034
 msgid "Rotate CW (right)"
 msgstr "Girar CW (a la derecha)"
 
-#: ../../Zotlabs/Module/Photos.php:1034
+#: ../../Zotlabs/Module/Photos.php:1035
 msgid "Rotate CCW (left)"
 msgstr "Girar CCW (a la izquierda)"
 
-#: ../../Zotlabs/Module/Photos.php:1037
+#: ../../Zotlabs/Module/Photos.php:1038
 msgid "Enter a new album name"
 msgstr "Introducir un nuevo nombre de álbum"
 
-#: ../../Zotlabs/Module/Photos.php:1038
+#: ../../Zotlabs/Module/Photos.php:1039
 msgid "or select an existing one (doubleclick)"
 msgstr "o seleccionar uno (doble click) existente"
 
-#: ../../Zotlabs/Module/Photos.php:1041
+#: ../../Zotlabs/Module/Photos.php:1042
 msgid "Caption"
 msgstr "Título"
 
-#: ../../Zotlabs/Module/Photos.php:1043
+#: ../../Zotlabs/Module/Photos.php:1044
 msgid "Add a Tag"
 msgstr "Añadir una etiqueta"
 
-#: ../../Zotlabs/Module/Photos.php:1047
+#: ../../Zotlabs/Module/Photos.php:1048
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
 msgstr "Ejemplos: @eva, @Carmen_Osuna, @jaime@ejemplo.com"
 
-#: ../../Zotlabs/Module/Photos.php:1050
+#: ../../Zotlabs/Module/Photos.php:1051
 msgid "Flag as adult in album view"
 msgstr "Marcar como \"solo para adultos\" en el álbum"
 
-#: ../../Zotlabs/Module/Photos.php:1069 ../../include/ItemObject.php:254
+#: ../../Zotlabs/Module/Photos.php:1070 ../../include/ItemObject.php:254
 msgid "I like this (toggle)"
 msgstr "Me gusta (cambiar)"
 
-#: ../../Zotlabs/Module/Photos.php:1070 ../../include/ItemObject.php:255
+#: ../../Zotlabs/Module/Photos.php:1071 ../../include/ItemObject.php:255
 msgid "I don't like this (toggle)"
 msgstr "No me gusta esto (cambiar)"
 
-#: ../../Zotlabs/Module/Photos.php:1088 ../../Zotlabs/Module/Photos.php:1206
+#: ../../Zotlabs/Module/Photos.php:1073 ../../include/ItemObject.php:389
+#: ../../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
 msgid "This is you"
 msgstr "Este es usted"
 
-#: ../../Zotlabs/Module/Photos.php:1090 ../../Zotlabs/Module/Photos.php:1208
+#: ../../Zotlabs/Module/Photos.php:1091 ../../Zotlabs/Module/Photos.php:1209
 #: ../../include/ItemObject.php:702 ../../include/js_strings.php:6
 msgid "Comment"
 msgstr "Comentar"
 
-#: ../../Zotlabs/Module/Photos.php:1106 ../../include/conversation.php:574
+#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:574
 msgctxt "title"
 msgid "Likes"
 msgstr "Me gusta"
 
-#: ../../Zotlabs/Module/Photos.php:1106 ../../include/conversation.php:574
+#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:574
 msgctxt "title"
 msgid "Dislikes"
 msgstr "No me gusta"
 
-#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:575
+#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:575
 msgctxt "title"
 msgid "Agree"
 msgstr "De acuerdo"
 
-#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:575
+#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:575
 msgctxt "title"
 msgid "Disagree"
 msgstr "En desacuerdo"
 
-#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:575
+#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:575
 msgctxt "title"
 msgid "Abstain"
 msgstr "Abstención"
 
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:576
+#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:576
 msgctxt "title"
 msgid "Attending"
 msgstr "Participaré"
 
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:576
+#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:576
 msgctxt "title"
 msgid "Not attending"
 msgstr "No participaré"
 
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:576
+#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:576
 msgctxt "title"
 msgid "Might attend"
 msgstr "Quizá participe"
 
-#: ../../Zotlabs/Module/Photos.php:1125 ../../Zotlabs/Module/Photos.php:1137
+#: ../../Zotlabs/Module/Photos.php:1126 ../../Zotlabs/Module/Photos.php:1138
 #: ../../include/ItemObject.php:175 ../../include/ItemObject.php:187
-#: ../../include/conversation.php:1736
+#: ../../include/conversation.php:1724
 msgid "View all"
 msgstr "Ver todo"
 
-#: ../../Zotlabs/Module/Photos.php:1129 ../../include/identity.php:1297
-#: ../../include/ItemObject.php:179 ../../include/conversation.php:1760
-#: ../../include/taxonomy.php:415
+#: ../../Zotlabs/Module/Photos.php:1130 ../../include/identity.php:1304
+#: ../../include/ItemObject.php:179 ../../include/conversation.php:1748
+#: ../../include/taxonomy.php:403
 msgctxt "noun"
 msgid "Like"
 msgid_plural "Likes"
 msgstr[0] "Me gusta"
 msgstr[1] "Me gusta"
 
-#: ../../Zotlabs/Module/Photos.php:1134 ../../include/ItemObject.php:184
-#: ../../include/conversation.php:1763
+#: ../../Zotlabs/Module/Photos.php:1135 ../../include/ItemObject.php:184
+#: ../../include/conversation.php:1751
 msgctxt "noun"
 msgid "Dislike"
 msgid_plural "Dislikes"
 msgstr[0] "No me gusta"
 msgstr[1] "No me gusta"
 
-#: ../../Zotlabs/Module/Photos.php:1234
+#: ../../Zotlabs/Module/Photos.php:1235
 msgid "Photo Tools"
 msgstr "Gestión de las fotos"
 
-#: ../../Zotlabs/Module/Photos.php:1243
+#: ../../Zotlabs/Module/Photos.php:1244
 msgid "In This Photo:"
 msgstr "En esta foto:"
 
-#: ../../Zotlabs/Module/Photos.php:1248
+#: ../../Zotlabs/Module/Photos.php:1249
 msgid "Map"
 msgstr "Mapa"
 
-#: ../../Zotlabs/Module/Photos.php:1256 ../../include/ItemObject.php:378
+#: ../../Zotlabs/Module/Photos.php:1257 ../../include/ItemObject.php:378
 msgctxt "noun"
 msgid "Likes"
 msgstr "Me gusta"
 
-#: ../../Zotlabs/Module/Photos.php:1257 ../../include/ItemObject.php:379
+#: ../../Zotlabs/Module/Photos.php:1258 ../../include/ItemObject.php:379
 msgctxt "noun"
 msgid "Dislikes"
 msgstr "No me gusta"
 
-#: ../../Zotlabs/Module/Photos.php:1262 ../../include/ItemObject.php:384
-#: ../../include/acl_selectors.php:252
+#: ../../Zotlabs/Module/Photos.php:1263 ../../include/acl_selectors.php:287
+#: ../../include/ItemObject.php:384
 msgid "Close"
 msgstr "Cerrar"
 
-#: ../../Zotlabs/Module/Photos.php:1339
+#: ../../Zotlabs/Module/Photos.php:1340
 msgid "View Album"
 msgstr "Ver álbum"
 
-#: ../../Zotlabs/Module/Photos.php:1350 ../../Zotlabs/Module/Photos.php:1363
-#: ../../Zotlabs/Module/Photos.php:1364
+#: ../../Zotlabs/Module/Photos.php:1351 ../../Zotlabs/Module/Photos.php:1364
+#: ../../Zotlabs/Module/Photos.php:1365
 msgid "Recent Photos"
 msgstr "Fotos recientes"
 
@@ -4299,13 +4245,13 @@ msgstr "le ha enviado un mensaje privado"
 msgid "added your channel"
 msgstr "añadió este canal a sus conexiones"
 
-#: ../../Zotlabs/Module/Ping.php:322 ../../include/identity.php:1116
-#: ../../include/identity.php:1192
+#: ../../Zotlabs/Module/Ping.php:322 ../../include/identity.php:1123
+#: ../../include/identity.php:1199
 msgid "g A l F d"
 msgstr "g A l d F"
 
-#: ../../Zotlabs/Module/Ping.php:345 ../../include/identity.php:1162
-#: ../../include/identity.php:1232
+#: ../../Zotlabs/Module/Ping.php:345 ../../include/identity.php:1169
+#: ../../include/identity.php:1239
 msgid "[today]"
 msgstr "[hoy]"
 
@@ -4313,8 +4259,8 @@ msgstr "[hoy]"
 msgid "posted an event"
 msgstr "publicó un evento"
 
-#: ../../Zotlabs/Module/Poke.php:168 ../../include/apps.php:145
-#: ../../include/conversation.php:965
+#: ../../Zotlabs/Module/Poke.php:168 ../../include/conversation.php:965
+#: ../../include/apps.php:177
 msgid "Poke"
 msgstr "Toques y otras cosas"
 
@@ -4443,7 +4389,7 @@ msgid "View this profile"
 msgstr "Ver este perfil"
 
 #: ../../Zotlabs/Module/Profiles.php:693 ../../Zotlabs/Module/Profiles.php:775
-#: ../../include/identity.php:952
+#: ../../include/identity.php:959
 msgid "Edit visibility"
 msgstr "Editar visibilidad"
 
@@ -4455,7 +4401,7 @@ msgstr "Gestión del perfil"
 msgid "Change cover photo"
 msgstr "Cambiar la imagen de portada del perfil"
 
-#: ../../Zotlabs/Module/Profiles.php:696 ../../include/identity.php:923
+#: ../../Zotlabs/Module/Profiles.php:696 ../../include/identity.php:930
 msgid "Change profile photo"
 msgstr "Cambiar la foto del perfil"
 
@@ -4475,8 +4421,8 @@ msgstr "Eliminar este perfil"
 msgid "Add profile things"
 msgstr "Añadir cosas al perfil"
 
-#: ../../Zotlabs/Module/Profiles.php:701 ../../include/conversation.php:1544
-#: ../../include/widgets.php:105
+#: ../../Zotlabs/Module/Profiles.php:701 ../../include/widgets.php:105
+#: ../../include/conversation.php:1532
 msgid "Personal"
 msgstr "Personales"
 
@@ -4616,11 +4562,11 @@ msgstr "Información de contacto y redes sociales"
 msgid "My other channels"
 msgstr "Mis otros canales"
 
-#: ../../Zotlabs/Module/Profiles.php:771 ../../include/identity.php:948
+#: ../../Zotlabs/Module/Profiles.php:771 ../../include/identity.php:955
 msgid "Profile Image"
 msgstr "Imagen del perfil"
 
-#: ../../Zotlabs/Module/Profiles.php:781 ../../include/identity.php:930
+#: ../../Zotlabs/Module/Profiles.php:781 ../../include/identity.php:937
 #: ../../include/nav.php:88
 msgid "Edit Profiles"
 msgstr "Editar perfiles"
@@ -4633,8 +4579,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:1388
-#: ../../include/apps.php:138
+#: ../../Zotlabs/Module/Profperm.php:117 ../../include/identity.php:1395
 msgid "Profile"
 msgstr "Perfil"
 
@@ -4646,7 +4591,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:1222
+#: ../../Zotlabs/Module/Pubsites.php:22 ../../include/widgets.php:1271
 msgid "Public Hubs"
 msgstr "Servidores públicos"
 
@@ -4873,7 +4818,7 @@ msgid ""
 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/Settings.php:703
+#: ../../Zotlabs/Module/Settings.php:705
 msgid "Remove Account"
 msgstr "Eliminar cuenta"
 
@@ -4901,7 +4846,7 @@ msgid ""
 "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:1122
+#: ../../Zotlabs/Module/Removeme.php:65 ../../Zotlabs/Module/Settings.php:1124
 msgid "Remove Channel"
 msgstr "Eliminar el canal"
 
@@ -4945,598 +4890,598 @@ msgstr "Resultados de la búsqueda para: %s"
 msgid "No service class restrictions found."
 msgstr "No se han encontrado restricciones sobre esta clase de servicio."
 
-#: ../../Zotlabs/Module/Settings.php:67
+#: ../../Zotlabs/Module/Settings.php:69
 msgid "Name is required"
 msgstr "El nombre es obligatorio"
 
-#: ../../Zotlabs/Module/Settings.php:71
+#: ../../Zotlabs/Module/Settings.php:73
 msgid "Key and Secret are required"
 msgstr "\"Key\" y \"Secret\" son obligatorios"
 
-#: ../../Zotlabs/Module/Settings.php:75 ../../Zotlabs/Module/Settings.php:614
-#: ../../include/apps.php:252
-msgid "Update"
-msgstr "Actualizar"
-
-#: ../../Zotlabs/Module/Settings.php:223
+#: ../../Zotlabs/Module/Settings.php:225
 msgid "Not valid email."
 msgstr "Correo electrónico no válido."
 
-#: ../../Zotlabs/Module/Settings.php:226
+#: ../../Zotlabs/Module/Settings.php:228
 msgid "Protected email address. Cannot change to that email."
 msgstr "Dirección de correo electrónico protegida. No se puede cambiar a ella."
 
-#: ../../Zotlabs/Module/Settings.php:235
+#: ../../Zotlabs/Module/Settings.php:237
 msgid "System failure storing new email. Please try again."
 msgstr "Fallo de sistema al guardar el nuevo correo electrónico. Por favor, inténtelo de nuevo."
 
-#: ../../Zotlabs/Module/Settings.php:252
+#: ../../Zotlabs/Module/Settings.php:254
 msgid "Password verification failed."
 msgstr "La comprobación de la contraseña ha fallado."
 
-#: ../../Zotlabs/Module/Settings.php:259
+#: ../../Zotlabs/Module/Settings.php:261
 msgid "Passwords do not match. Password unchanged."
 msgstr "Las contraseñas no coinciden. La contraseña no se ha cambiado."
 
-#: ../../Zotlabs/Module/Settings.php:263
+#: ../../Zotlabs/Module/Settings.php:265
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr "No se permiten contraseñas vacías. La contraseña no se ha cambiado."
 
-#: ../../Zotlabs/Module/Settings.php:277
+#: ../../Zotlabs/Module/Settings.php:279
 msgid "Password changed."
 msgstr "Contraseña cambiada."
 
-#: ../../Zotlabs/Module/Settings.php:279
+#: ../../Zotlabs/Module/Settings.php:281
 msgid "Password update failed. Please try again."
 msgstr "La actualización de la contraseña ha fallado. Por favor, inténtalo de nuevo."
 
-#: ../../Zotlabs/Module/Settings.php:523
+#: ../../Zotlabs/Module/Settings.php:525
 msgid "Settings updated."
 msgstr "Ajustes actualizados."
 
-#: ../../Zotlabs/Module/Settings.php:587 ../../Zotlabs/Module/Settings.php:613
-#: ../../Zotlabs/Module/Settings.php:649
+#: ../../Zotlabs/Module/Settings.php:589 ../../Zotlabs/Module/Settings.php:615
+#: ../../Zotlabs/Module/Settings.php:651
 msgid "Add application"
 msgstr "Añadir aplicación"
 
-#: ../../Zotlabs/Module/Settings.php:590
+#: ../../Zotlabs/Module/Settings.php:592
 msgid "Name of application"
 msgstr "Nombre de la aplicación"
 
-#: ../../Zotlabs/Module/Settings.php:591 ../../Zotlabs/Module/Settings.php:617
+#: ../../Zotlabs/Module/Settings.php:593 ../../Zotlabs/Module/Settings.php:619
 msgid "Consumer Key"
 msgstr "Consumer Key"
 
-#: ../../Zotlabs/Module/Settings.php:591 ../../Zotlabs/Module/Settings.php:592
+#: ../../Zotlabs/Module/Settings.php:593 ../../Zotlabs/Module/Settings.php:594
 msgid "Automatically generated - change if desired. Max length 20"
 msgstr "Generado automáticamente - si lo desea,  cámbielo. Longitud máxima: 20"
 
-#: ../../Zotlabs/Module/Settings.php:592 ../../Zotlabs/Module/Settings.php:618
+#: ../../Zotlabs/Module/Settings.php:594 ../../Zotlabs/Module/Settings.php:620
 msgid "Consumer Secret"
 msgstr "Consumer Secret"
 
-#: ../../Zotlabs/Module/Settings.php:593 ../../Zotlabs/Module/Settings.php:619
+#: ../../Zotlabs/Module/Settings.php:595 ../../Zotlabs/Module/Settings.php:621
 msgid "Redirect"
 msgstr "Redirigir"
 
-#: ../../Zotlabs/Module/Settings.php:593
+#: ../../Zotlabs/Module/Settings.php:595
 msgid ""
 "Redirect URI - leave blank unless your application specifically requires "
 "this"
 msgstr "URI de redirección - dejar en blanco a menos que su aplicación específicamente lo requiera"
 
-#: ../../Zotlabs/Module/Settings.php:594 ../../Zotlabs/Module/Settings.php:620
+#: ../../Zotlabs/Module/Settings.php:596 ../../Zotlabs/Module/Settings.php:622
 msgid "Icon url"
 msgstr "Dirección del icono"
 
-#: ../../Zotlabs/Module/Settings.php:594
+#: ../../Zotlabs/Module/Settings.php:596 ../../Zotlabs/Module/Sources.php:112
+#: ../../Zotlabs/Module/Sources.php:147
 msgid "Optional"
 msgstr "Opcional"
 
-#: ../../Zotlabs/Module/Settings.php:605
+#: ../../Zotlabs/Module/Settings.php:607
 msgid "Application not found."
 msgstr "Aplicación no encontrada."
 
-#: ../../Zotlabs/Module/Settings.php:648
+#: ../../Zotlabs/Module/Settings.php:650
 msgid "Connected Apps"
-msgstr "Aplicaciones conectadas"
+msgstr "Aplicaciones (apps) conectadas"
 
-#: ../../Zotlabs/Module/Settings.php:652
+#: ../../Zotlabs/Module/Settings.php:654
 msgid "Client key starts with"
 msgstr "La \"client key\" empieza por"
 
-#: ../../Zotlabs/Module/Settings.php:653
+#: ../../Zotlabs/Module/Settings.php:655
 msgid "No name"
 msgstr "Sin nombre"
 
-#: ../../Zotlabs/Module/Settings.php:654
+#: ../../Zotlabs/Module/Settings.php:656
 msgid "Remove authorization"
 msgstr "Eliminar autorización"
 
-#: ../../Zotlabs/Module/Settings.php:667
+#: ../../Zotlabs/Module/Settings.php:669
 msgid "No feature settings configured"
 msgstr "No se ha establecido la configuración de los complementos"
 
-#: ../../Zotlabs/Module/Settings.php:674
+#: ../../Zotlabs/Module/Settings.php:676
 msgid "Feature/Addon Settings"
 msgstr "Ajustes de los complementos"
 
-#: ../../Zotlabs/Module/Settings.php:697
+#: ../../Zotlabs/Module/Settings.php:699
 msgid "Account Settings"
 msgstr "Configuración de la cuenta"
 
-#: ../../Zotlabs/Module/Settings.php:698
+#: ../../Zotlabs/Module/Settings.php:700
 msgid "Current Password"
 msgstr "Contraseña actual"
 
-#: ../../Zotlabs/Module/Settings.php:699
+#: ../../Zotlabs/Module/Settings.php:701
 msgid "Enter New Password"
 msgstr "Escribir una nueva contraseña"
 
-#: ../../Zotlabs/Module/Settings.php:700
+#: ../../Zotlabs/Module/Settings.php:702
 msgid "Confirm New Password"
 msgstr "Confirmar la nueva contraseña"
 
-#: ../../Zotlabs/Module/Settings.php:700
+#: ../../Zotlabs/Module/Settings.php:702
 msgid "Leave password fields blank unless changing"
 msgstr "Dejar en blanco la contraseña a menos que desee cambiarla."
 
-#: ../../Zotlabs/Module/Settings.php:702
-#: ../../Zotlabs/Module/Settings.php:1039
+#: ../../Zotlabs/Module/Settings.php:704
+#: ../../Zotlabs/Module/Settings.php:1041
 msgid "Email Address:"
 msgstr "Dirección de correo electrónico:"
 
-#: ../../Zotlabs/Module/Settings.php:704
+#: ../../Zotlabs/Module/Settings.php:706
 msgid "Remove this account including all its channels"
 msgstr "Eliminar esta cuenta incluyendo todos sus canales"
 
-#: ../../Zotlabs/Module/Settings.php:727
+#: ../../Zotlabs/Module/Settings.php:729
 msgid "Additional Features"
 msgstr "Funcionalidades"
 
-#: ../../Zotlabs/Module/Settings.php:751
+#: ../../Zotlabs/Module/Settings.php:753
 msgid "Connector Settings"
 msgstr "Configuración del conector"
 
-#: ../../Zotlabs/Module/Settings.php:790
+#: ../../Zotlabs/Module/Settings.php:792
 msgid "No special theme for mobile devices"
 msgstr "Sin tema especial para dispositivos móviles"
 
-#: ../../Zotlabs/Module/Settings.php:793
+#: ../../Zotlabs/Module/Settings.php:795
 #, php-format
 msgid "%s - (Experimental)"
 msgstr "%s - (Experimental)"
 
-#: ../../Zotlabs/Module/Settings.php:835
+#: ../../Zotlabs/Module/Settings.php:837
 msgid "Display Settings"
 msgstr "Ajustes de visualización"
 
-#: ../../Zotlabs/Module/Settings.php:836
+#: ../../Zotlabs/Module/Settings.php:838
 msgid "Theme Settings"
 msgstr "Ajustes del tema"
 
-#: ../../Zotlabs/Module/Settings.php:837
+#: ../../Zotlabs/Module/Settings.php:839
 msgid "Custom Theme Settings"
 msgstr "Ajustes personalizados del tema"
 
-#: ../../Zotlabs/Module/Settings.php:838
+#: ../../Zotlabs/Module/Settings.php:840
 msgid "Content Settings"
 msgstr "Ajustes del contenido"
 
-#: ../../Zotlabs/Module/Settings.php:844
+#: ../../Zotlabs/Module/Settings.php:846
 msgid "Display Theme:"
 msgstr "Tema gráfico del perfil:"
 
-#: ../../Zotlabs/Module/Settings.php:845
+#: ../../Zotlabs/Module/Settings.php:847
 msgid "Mobile Theme:"
 msgstr "Tema para el móvil:"
 
-#: ../../Zotlabs/Module/Settings.php:846
+#: ../../Zotlabs/Module/Settings.php:848
 msgid "Preload images before rendering the page"
 msgstr "Carga previa de las imágenes antes de generar la página"
 
-#: ../../Zotlabs/Module/Settings.php:846
+#: ../../Zotlabs/Module/Settings.php:848
 msgid ""
 "The subjective page load time will be longer but the page will be ready when"
 " displayed"
 msgstr "El tiempo subjetivo de carga de la página será más largo, pero la página estará lista cuando se muestre."
 
-#: ../../Zotlabs/Module/Settings.php:847
+#: ../../Zotlabs/Module/Settings.php:849
 msgid "Enable user zoom on mobile devices"
 msgstr "Habilitar zoom de usuario en dispositivos móviles"
 
-#: ../../Zotlabs/Module/Settings.php:848
+#: ../../Zotlabs/Module/Settings.php:850
 msgid "Update browser every xx seconds"
 msgstr "Actualizar navegador cada xx segundos"
 
-#: ../../Zotlabs/Module/Settings.php:848
+#: ../../Zotlabs/Module/Settings.php:850
 msgid "Minimum of 10 seconds, no maximum"
 msgstr "Mínimo de 10 segundos, sin máximo"
 
-#: ../../Zotlabs/Module/Settings.php:849
+#: ../../Zotlabs/Module/Settings.php:851
 msgid "Maximum number of conversations to load at any time:"
 msgstr "Máximo número de conversaciones a cargar en cualquier momento:"
 
-#: ../../Zotlabs/Module/Settings.php:849
+#: ../../Zotlabs/Module/Settings.php:851
 msgid "Maximum of 100 items"
 msgstr "Máximo de 100 elementos"
 
-#: ../../Zotlabs/Module/Settings.php:850
+#: ../../Zotlabs/Module/Settings.php:852
 msgid "Show emoticons (smilies) as images"
 msgstr "Mostrar emoticonos (smilies) como imágenes"
 
-#: ../../Zotlabs/Module/Settings.php:851
+#: ../../Zotlabs/Module/Settings.php:853
 msgid "Link post titles to source"
 msgstr "Enlazar título de la publicación a la fuente original"
 
-#: ../../Zotlabs/Module/Settings.php:852
+#: ../../Zotlabs/Module/Settings.php:854
 msgid "System Page Layout Editor - (advanced)"
 msgstr "Editor de plantilla de página del sistema - (avanzado)"
 
-#: ../../Zotlabs/Module/Settings.php:855
+#: ../../Zotlabs/Module/Settings.php:857
 msgid "Use blog/list mode on channel page"
 msgstr "Usar modo blog/lista en la página de inicio del canal"
 
-#: ../../Zotlabs/Module/Settings.php:855 ../../Zotlabs/Module/Settings.php:856
+#: ../../Zotlabs/Module/Settings.php:857 ../../Zotlabs/Module/Settings.php:858
 msgid "(comments displayed separately)"
 msgstr "(comentarios mostrados de forma separada)"
 
-#: ../../Zotlabs/Module/Settings.php:856
+#: ../../Zotlabs/Module/Settings.php:858
 msgid "Use blog/list mode on grid page"
 msgstr "Mostrar mi red en modo blog"
 
-#: ../../Zotlabs/Module/Settings.php:857
+#: ../../Zotlabs/Module/Settings.php:859
 msgid "Channel page max height of content (in pixels)"
 msgstr "Altura máxima del contenido de la página del canal (en píxeles)"
 
-#: ../../Zotlabs/Module/Settings.php:857 ../../Zotlabs/Module/Settings.php:858
+#: ../../Zotlabs/Module/Settings.php:859 ../../Zotlabs/Module/Settings.php:860
 msgid "click to expand content exceeding this height"
 msgstr "Pulsar para expandir el contenido que exceda de esta altura"
 
-#: ../../Zotlabs/Module/Settings.php:858
+#: ../../Zotlabs/Module/Settings.php:860
 msgid "Grid page max height of content (in pixels)"
 msgstr "Altura máxima del contenido de mi red (en píxeles)"
 
-#: ../../Zotlabs/Module/Settings.php:892
+#: ../../Zotlabs/Module/Settings.php:894
 msgid "Nobody except yourself"
 msgstr "Nadie excepto usted"
 
-#: ../../Zotlabs/Module/Settings.php:893
+#: ../../Zotlabs/Module/Settings.php:895
 msgid "Only those you specifically allow"
 msgstr "Solo aquellos a los que usted permita explícitamente"
 
-#: ../../Zotlabs/Module/Settings.php:894
+#: ../../Zotlabs/Module/Settings.php:896
 msgid "Approved connections"
 msgstr "Conexiones aprobadas"
 
-#: ../../Zotlabs/Module/Settings.php:895
+#: ../../Zotlabs/Module/Settings.php:897
 msgid "Any connections"
 msgstr "Cualquier conexión"
 
-#: ../../Zotlabs/Module/Settings.php:896
+#: ../../Zotlabs/Module/Settings.php:898
 msgid "Anybody on this website"
 msgstr "Cualquiera en este sitio web"
 
-#: ../../Zotlabs/Module/Settings.php:897
+#: ../../Zotlabs/Module/Settings.php:899
 msgid "Anybody in this network"
 msgstr "Cualquiera en esta red"
 
-#: ../../Zotlabs/Module/Settings.php:898
+#: ../../Zotlabs/Module/Settings.php:900
 msgid "Anybody authenticated"
 msgstr "Cualquiera que esté autenticado"
 
-#: ../../Zotlabs/Module/Settings.php:899
+#: ../../Zotlabs/Module/Settings.php:901
 msgid "Anybody on the internet"
 msgstr "Cualquiera en internet"
 
-#: ../../Zotlabs/Module/Settings.php:974
+#: ../../Zotlabs/Module/Settings.php:976
 msgid "Publish your default profile in the network directory"
 msgstr "Publicar su perfil principal en el directorio de la red"
 
-#: ../../Zotlabs/Module/Settings.php:979
+#: ../../Zotlabs/Module/Settings.php:981
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr "¿Nos permite sugerirle como amigo potencial a los nuevos miembros?"
 
-#: ../../Zotlabs/Module/Settings.php:988
+#: ../../Zotlabs/Module/Settings.php:990
 msgid "Your channel address is"
 msgstr "Su dirección de canal es"
 
-#: ../../Zotlabs/Module/Settings.php:1030
+#: ../../Zotlabs/Module/Settings.php:1032
 msgid "Channel Settings"
 msgstr "Ajustes del canal"
 
-#: ../../Zotlabs/Module/Settings.php:1037
+#: ../../Zotlabs/Module/Settings.php:1039
 msgid "Basic Settings"
 msgstr "Configuración básica"
 
-#: ../../Zotlabs/Module/Settings.php:1038 ../../include/identity.php:1279
+#: ../../Zotlabs/Module/Settings.php:1040 ../../include/identity.php:1286
 msgid "Full Name:"
 msgstr "Nombre completo:"
 
-#: ../../Zotlabs/Module/Settings.php:1040
+#: ../../Zotlabs/Module/Settings.php:1042
 msgid "Your Timezone:"
 msgstr "Su huso horario:"
 
-#: ../../Zotlabs/Module/Settings.php:1041
+#: ../../Zotlabs/Module/Settings.php:1043
 msgid "Default Post Location:"
 msgstr "Localización geográfica predeterminada para sus publicaciones:"
 
-#: ../../Zotlabs/Module/Settings.php:1041
+#: ../../Zotlabs/Module/Settings.php:1043
 msgid "Geographical location to display on your posts"
 msgstr "Localización geográfica que debe mostrarse en sus publicaciones"
 
-#: ../../Zotlabs/Module/Settings.php:1042
+#: ../../Zotlabs/Module/Settings.php:1044
 msgid "Use Browser Location:"
 msgstr "Usar la localización geográfica del navegador:"
 
-#: ../../Zotlabs/Module/Settings.php:1044
+#: ../../Zotlabs/Module/Settings.php:1046
 msgid "Adult Content"
 msgstr "Contenido solo para adultos"
 
-#: ../../Zotlabs/Module/Settings.php:1044
+#: ../../Zotlabs/Module/Settings.php:1046
 msgid ""
 "This channel frequently or regularly publishes adult content. (Please tag "
 "any adult material and/or nudity with #NSFW)"
 msgstr "Este canal publica contenido solo para adultos con frecuencia o regularmente. (Por favor etiquete cualquier material para adultos con la etiqueta #NSFW)"
 
-#: ../../Zotlabs/Module/Settings.php:1046
+#: ../../Zotlabs/Module/Settings.php:1048
 msgid "Security and Privacy Settings"
 msgstr "Configuración de seguridad y privacidad"
 
-#: ../../Zotlabs/Module/Settings.php:1049
+#: ../../Zotlabs/Module/Settings.php:1051
 msgid "Your permissions are already configured. Click to view/adjust"
 msgstr "Sus permisos ya están configurados. Pulse para ver/ajustar"
 
-#: ../../Zotlabs/Module/Settings.php:1051
+#: ../../Zotlabs/Module/Settings.php:1053
 msgid "Hide my online presence"
 msgstr "Ocultar mi presencia en línea"
 
-#: ../../Zotlabs/Module/Settings.php:1051
+#: ../../Zotlabs/Module/Settings.php:1053
 msgid "Prevents displaying in your profile that you are online"
 msgstr "Evitar mostrar en su perfil que está en línea"
 
-#: ../../Zotlabs/Module/Settings.php:1053
+#: ../../Zotlabs/Module/Settings.php:1055
 msgid "Simple Privacy Settings:"
 msgstr "Configuración de privacidad sencilla:"
 
-#: ../../Zotlabs/Module/Settings.php:1054
+#: ../../Zotlabs/Module/Settings.php:1056
 msgid ""
 "Very Public - <em>extremely permissive (should be used with caution)</em>"
 msgstr "Muy Público - <em>extremadamente permisivo (debería ser usado con precaución)</em>"
 
-#: ../../Zotlabs/Module/Settings.php:1055
+#: ../../Zotlabs/Module/Settings.php:1057
 msgid ""
 "Typical - <em>default public, privacy when desired (similar to social "
 "network permissions but with improved privacy)</em>"
 msgstr "Típico - <em>por defecto público, privado cuando se desee (similar a los permisos de una red social pero con privacidad mejorada)</em>"
 
-#: ../../Zotlabs/Module/Settings.php:1056
+#: ../../Zotlabs/Module/Settings.php:1058
 msgid "Private - <em>default private, never open or public</em>"
 msgstr "Privado - <em>por defecto, privado, nunca abierto o público</em>"
 
-#: ../../Zotlabs/Module/Settings.php:1057
+#: ../../Zotlabs/Module/Settings.php:1059
 msgid "Blocked - <em>default blocked to/from everybody</em>"
 msgstr "Bloqueado - <em>por defecto, bloqueado/a para cualquiera</em>"
 
-#: ../../Zotlabs/Module/Settings.php:1059
+#: ../../Zotlabs/Module/Settings.php:1061
 msgid "Allow others to tag your posts"
 msgstr "Permitir a otros etiquetar sus publicaciones"
 
-#: ../../Zotlabs/Module/Settings.php:1059
+#: ../../Zotlabs/Module/Settings.php:1061
 msgid ""
 "Often used by the community to retro-actively flag inappropriate content"
 msgstr "A menudo usado por la comunidad para marcar contenido inapropiado de forma retroactiva."
 
-#: ../../Zotlabs/Module/Settings.php:1061
+#: ../../Zotlabs/Module/Settings.php:1063
 msgid "Advanced Privacy Settings"
 msgstr "Configuración de privacidad avanzada"
 
-#: ../../Zotlabs/Module/Settings.php:1063
+#: ../../Zotlabs/Module/Settings.php:1065
 msgid "Expire other channel content after this many days"
 msgstr "Caducar contenido de otros canales después de este número de días"
 
-#: ../../Zotlabs/Module/Settings.php:1063
+#: ../../Zotlabs/Module/Settings.php:1065
 #, php-format
 msgid ""
 "0 or blank to use the website limit. The website expires after %d days."
 msgstr "0 o en blanco para usar el límite del sitio. El sitio web caduca después de %d días."
 
-#: ../../Zotlabs/Module/Settings.php:1064
+#: ../../Zotlabs/Module/Settings.php:1066
 msgid "Maximum Friend Requests/Day:"
 msgstr "Máximo de solicitudes de amistad por día:"
 
-#: ../../Zotlabs/Module/Settings.php:1064
+#: ../../Zotlabs/Module/Settings.php:1066
 msgid "May reduce spam activity"
 msgstr "Podría reducir la actividad de spam"
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Zotlabs/Module/Settings.php:1067
 msgid "Default Post Permissions"
 msgstr "Permisos de publicación predeterminados"
 
-#: ../../Zotlabs/Module/Settings.php:1070
+#: ../../Zotlabs/Module/Settings.php:1069
+msgid "Use my default audience setting for the type of post"
+msgstr "Usar los ajustes de mi audiencia predeterminada para el tipo de publicación"
+
+#: ../../Zotlabs/Module/Settings.php:1072
 msgid "Channel permissions category:"
 msgstr "Categoría de permisos del canal:"
 
-#: ../../Zotlabs/Module/Settings.php:1076
+#: ../../Zotlabs/Module/Settings.php:1078
 msgid "Maximum private messages per day from unknown people:"
 msgstr "Máximo de mensajes privados por día de gente desconocida:"
 
-#: ../../Zotlabs/Module/Settings.php:1076
+#: ../../Zotlabs/Module/Settings.php:1078
 msgid "Useful to reduce spamming"
 msgstr "Útil para reducir el envío de correo no deseado"
 
-#: ../../Zotlabs/Module/Settings.php:1079
+#: ../../Zotlabs/Module/Settings.php:1081
 msgid "Notification Settings"
 msgstr "Configuración de las notificaciones"
 
-#: ../../Zotlabs/Module/Settings.php:1080
+#: ../../Zotlabs/Module/Settings.php:1082
 msgid "By default post a status message when:"
 msgstr "Por defecto, enviar un mensaje de estado cuando:"
 
-#: ../../Zotlabs/Module/Settings.php:1081
+#: ../../Zotlabs/Module/Settings.php:1083
 msgid "accepting a friend request"
 msgstr "Acepte una solicitud de amistad"
 
-#: ../../Zotlabs/Module/Settings.php:1082
+#: ../../Zotlabs/Module/Settings.php:1084
 msgid "joining a forum/community"
 msgstr "al unirse a un foro o comunidad"
 
-#: ../../Zotlabs/Module/Settings.php:1083
+#: ../../Zotlabs/Module/Settings.php:1085
 msgid "making an <em>interesting</em> profile change"
 msgstr "Realice un cambio <em>interesante</em> en su perfil"
 
-#: ../../Zotlabs/Module/Settings.php:1084
+#: ../../Zotlabs/Module/Settings.php:1086
 msgid "Send a notification email when:"
 msgstr "Enviar una notificación por correo electrónico cuando:"
 
-#: ../../Zotlabs/Module/Settings.php:1085
+#: ../../Zotlabs/Module/Settings.php:1087
 msgid "You receive a connection request"
 msgstr "Reciba una solicitud de conexión"
 
-#: ../../Zotlabs/Module/Settings.php:1086
+#: ../../Zotlabs/Module/Settings.php:1088
 msgid "Your connections are confirmed"
 msgstr "Sus conexiones hayan sido confirmadas"
 
-#: ../../Zotlabs/Module/Settings.php:1087
+#: ../../Zotlabs/Module/Settings.php:1089
 msgid "Someone writes on your profile wall"
 msgstr "Alguien escriba en la página de su perfil (\"muro\")"
 
-#: ../../Zotlabs/Module/Settings.php:1088
+#: ../../Zotlabs/Module/Settings.php:1090
 msgid "Someone writes a followup comment"
 msgstr "Alguien escriba un comentario sobre sus publicaciones"
 
-#: ../../Zotlabs/Module/Settings.php:1089
+#: ../../Zotlabs/Module/Settings.php:1091
 msgid "You receive a private message"
 msgstr "Reciba un mensaje privado"
 
-#: ../../Zotlabs/Module/Settings.php:1090
+#: ../../Zotlabs/Module/Settings.php:1092
 msgid "You receive a friend suggestion"
 msgstr "Reciba una sugerencia de amistad"
 
-#: ../../Zotlabs/Module/Settings.php:1091
+#: ../../Zotlabs/Module/Settings.php:1093
 msgid "You are tagged in a post"
 msgstr "Usted sea etiquetado en una publicación"
 
-#: ../../Zotlabs/Module/Settings.php:1092
+#: ../../Zotlabs/Module/Settings.php:1094
 msgid "You are poked/prodded/etc. in a post"
 msgstr "Reciba un toque o incitación en una publicación"
 
-#: ../../Zotlabs/Module/Settings.php:1095
+#: ../../Zotlabs/Module/Settings.php:1097
 msgid "Show visual notifications including:"
 msgstr "Mostrar notificaciones visuales que incluyan:"
 
-#: ../../Zotlabs/Module/Settings.php:1097
+#: ../../Zotlabs/Module/Settings.php:1099
 msgid "Unseen grid activity"
 msgstr "Nueva actividad en la red"
 
-#: ../../Zotlabs/Module/Settings.php:1098
+#: ../../Zotlabs/Module/Settings.php:1100
 msgid "Unseen channel activity"
 msgstr "Actividad no vista en el canal"
 
-#: ../../Zotlabs/Module/Settings.php:1099
+#: ../../Zotlabs/Module/Settings.php:1101
 msgid "Unseen private messages"
 msgstr "Mensajes privados no leídos"
 
-#: ../../Zotlabs/Module/Settings.php:1099
-#: ../../Zotlabs/Module/Settings.php:1104
-#: ../../Zotlabs/Module/Settings.php:1105
+#: ../../Zotlabs/Module/Settings.php:1101
 #: ../../Zotlabs/Module/Settings.php:1106
+#: ../../Zotlabs/Module/Settings.php:1107
+#: ../../Zotlabs/Module/Settings.php:1108
 msgid "Recommended"
 msgstr "Recomendado"
 
-#: ../../Zotlabs/Module/Settings.php:1100
+#: ../../Zotlabs/Module/Settings.php:1102
 msgid "Upcoming events"
 msgstr "Próximos eventos"
 
-#: ../../Zotlabs/Module/Settings.php:1101
+#: ../../Zotlabs/Module/Settings.php:1103
 msgid "Events today"
 msgstr "Eventos de hoy"
 
-#: ../../Zotlabs/Module/Settings.php:1102
+#: ../../Zotlabs/Module/Settings.php:1104
 msgid "Upcoming birthdays"
 msgstr "Próximos cumpleaños"
 
-#: ../../Zotlabs/Module/Settings.php:1102
+#: ../../Zotlabs/Module/Settings.php:1104
 msgid "Not available in all themes"
 msgstr "No disponible en todos los temas"
 
-#: ../../Zotlabs/Module/Settings.php:1103
+#: ../../Zotlabs/Module/Settings.php:1105
 msgid "System (personal) notifications"
 msgstr "Notificaciones del sistema (personales)"
 
-#: ../../Zotlabs/Module/Settings.php:1104
+#: ../../Zotlabs/Module/Settings.php:1106
 msgid "System info messages"
 msgstr "Mensajes de información del sistema"
 
-#: ../../Zotlabs/Module/Settings.php:1105
+#: ../../Zotlabs/Module/Settings.php:1107
 msgid "System critical alerts"
 msgstr "Alertas críticas del sistema"
 
-#: ../../Zotlabs/Module/Settings.php:1106
+#: ../../Zotlabs/Module/Settings.php:1108
 msgid "New connections"
 msgstr "Nuevas conexiones"
 
-#: ../../Zotlabs/Module/Settings.php:1107
+#: ../../Zotlabs/Module/Settings.php:1109
 msgid "System Registrations"
 msgstr "Registros del sistema"
 
-#: ../../Zotlabs/Module/Settings.php:1108
+#: ../../Zotlabs/Module/Settings.php:1110
 msgid ""
 "Also show new wall posts, private messages and connections under Notices"
 msgstr "Mostrar también en Avisos las nuevas publicaciones, los mensajes privados y las conexiones"
 
-#: ../../Zotlabs/Module/Settings.php:1110
+#: ../../Zotlabs/Module/Settings.php:1112
 msgid "Notify me of events this many days in advance"
 msgstr "Avisarme de los eventos con algunos días de antelación"
 
-#: ../../Zotlabs/Module/Settings.php:1110
+#: ../../Zotlabs/Module/Settings.php:1112
 msgid "Must be greater than 0"
 msgstr "Debe ser mayor que 0"
 
-#: ../../Zotlabs/Module/Settings.php:1112
+#: ../../Zotlabs/Module/Settings.php:1114
 msgid "Advanced Account/Page Type Settings"
 msgstr "Ajustes avanzados de la cuenta y de los tipos de página"
 
-#: ../../Zotlabs/Module/Settings.php:1113
+#: ../../Zotlabs/Module/Settings.php:1115
 msgid "Change the behaviour of this account for special situations"
 msgstr "Cambiar el comportamiento de esta cuenta en situaciones especiales"
 
-#: ../../Zotlabs/Module/Settings.php:1116
+#: ../../Zotlabs/Module/Settings.php:1118
 msgid ""
 "Please enable expert mode (in <a href=\"settings/features\">Settings > "
 "Additional features</a>) to adjust!"
 msgstr "¡Activar el modo de experto (en <a href=\"settings/features\">Ajustes > Funcionalidades</a>) para realizar cambios!."
 
-#: ../../Zotlabs/Module/Settings.php:1117
+#: ../../Zotlabs/Module/Settings.php:1119
 msgid "Miscellaneous Settings"
 msgstr "Ajustes diversos"
 
-#: ../../Zotlabs/Module/Settings.php:1118
+#: ../../Zotlabs/Module/Settings.php:1120
 msgid "Default photo upload folder"
 msgstr "Carpeta por defecto de las fotos subidas"
 
-#: ../../Zotlabs/Module/Settings.php:1118
-#: ../../Zotlabs/Module/Settings.php:1119
+#: ../../Zotlabs/Module/Settings.php:1120
+#: ../../Zotlabs/Module/Settings.php:1121
 msgid "%Y - current year, %m -  current month"
 msgstr "%Y - año en curso, %m - mes actual"
 
-#: ../../Zotlabs/Module/Settings.php:1119
+#: ../../Zotlabs/Module/Settings.php:1121
 msgid "Default file upload folder"
 msgstr "Carpeta por defecto de los archivos subidos"
 
-#: ../../Zotlabs/Module/Settings.php:1121
+#: ../../Zotlabs/Module/Settings.php:1123
 msgid "Personal menu to display in your channel pages"
 msgstr "Menú personal que debe mostrarse en las páginas de su canal"
 
-#: ../../Zotlabs/Module/Settings.php:1123
+#: ../../Zotlabs/Module/Settings.php:1125
 msgid "Remove this channel."
 msgstr "Eliminar este canal."
 
-#: ../../Zotlabs/Module/Settings.php:1124
+#: ../../Zotlabs/Module/Settings.php:1126
 msgid "Firefox Share $Projectname provider"
 msgstr "Servicio de compartición de Firefox: proveedor $Projectname"
 
-#: ../../Zotlabs/Module/Settings.php:1125
+#: ../../Zotlabs/Module/Settings.php:1127
 msgid "Start calendar week on monday"
 msgstr "Comenzar el calendario semanal por el lunes"
 
@@ -5569,7 +5514,7 @@ msgid ""
 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:739
+#: ../../Zotlabs/Module/Setup.php:744
 msgid "Please see the file \"install/INSTALL.txt\"."
 msgstr "Por favor, lea el fichero \"install/INSTALL.txt\"."
 
@@ -5671,289 +5616,297 @@ msgid ""
 "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:422
+#: ../../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:412
+msgid "PHP version"
+msgstr "Versión de PHP"
+
+#: ../../Zotlabs/Module/Setup.php:427
 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:423
+#: ../../Zotlabs/Module/Setup.php:428
 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:427
+#: ../../Zotlabs/Module/Setup.php:432
 msgid "PHP executable path"
 msgstr "Ruta del ejecutable PHP"
 
-#: ../../Zotlabs/Module/Setup.php:427
+#: ../../Zotlabs/Module/Setup.php:432
 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:432
+#: ../../Zotlabs/Module/Setup.php:437
 msgid "Command line PHP"
 msgstr "PHP en línea de comandos"
 
-#: ../../Zotlabs/Module/Setup.php:441
+#: ../../Zotlabs/Module/Setup.php:446
 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:442
+#: ../../Zotlabs/Module/Setup.php:447
 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:445
+#: ../../Zotlabs/Module/Setup.php:450
 msgid "PHP register_argc_argv"
 msgstr "PHP register_argc_argv"
 
-#: ../../Zotlabs/Module/Setup.php:463
+#: ../../Zotlabs/Module/Setup.php:468
 #, 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:468
+#: ../../Zotlabs/Module/Setup.php:473
 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:470
+#: ../../Zotlabs/Module/Setup.php:475
 msgid "PHP upload limits"
 msgstr "Límites PHP de subida"
 
-#: ../../Zotlabs/Module/Setup.php:493
+#: ../../Zotlabs/Module/Setup.php:498
 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:494
+#: ../../Zotlabs/Module/Setup.php:499
 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:497
+#: ../../Zotlabs/Module/Setup.php:502
 msgid "Generate encryption keys"
 msgstr "Generar claves de cifrado"
 
-#: ../../Zotlabs/Module/Setup.php:509
+#: ../../Zotlabs/Module/Setup.php:514
 msgid "libCurl PHP module"
 msgstr "módulo libCurl PHP"
 
-#: ../../Zotlabs/Module/Setup.php:510
+#: ../../Zotlabs/Module/Setup.php:515
 msgid "GD graphics PHP module"
 msgstr "módulo PHP GD graphics"
 
-#: ../../Zotlabs/Module/Setup.php:511
+#: ../../Zotlabs/Module/Setup.php:516
 msgid "OpenSSL PHP module"
 msgstr "módulo PHP OpenSSL"
 
-#: ../../Zotlabs/Module/Setup.php:512
+#: ../../Zotlabs/Module/Setup.php:517
 msgid "mysqli or postgres PHP module"
 msgstr "módulo PHP mysqli o postgres"
 
-#: ../../Zotlabs/Module/Setup.php:513
+#: ../../Zotlabs/Module/Setup.php:518
 msgid "mb_string PHP module"
 msgstr "módulo PHP mb_string"
 
-#: ../../Zotlabs/Module/Setup.php:514
+#: ../../Zotlabs/Module/Setup.php:519
 msgid "mcrypt PHP module"
 msgstr "módulo PHP mcrypt "
 
-#: ../../Zotlabs/Module/Setup.php:515
+#: ../../Zotlabs/Module/Setup.php:520
 msgid "xml PHP module"
 msgstr "módulo PHP xml"
 
-#: ../../Zotlabs/Module/Setup.php:519 ../../Zotlabs/Module/Setup.php:521
+#: ../../Zotlabs/Module/Setup.php:524 ../../Zotlabs/Module/Setup.php:526
 msgid "Apache mod_rewrite module"
 msgstr "módulo Apache mod_rewrite "
 
-#: ../../Zotlabs/Module/Setup.php:519
+#: ../../Zotlabs/Module/Setup.php:524
 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:525 ../../Zotlabs/Module/Setup.php:528
+#: ../../Zotlabs/Module/Setup.php:530 ../../Zotlabs/Module/Setup.php:533
 msgid "proc_open"
 msgstr "proc_open"
 
-#: ../../Zotlabs/Module/Setup.php:525
+#: ../../Zotlabs/Module/Setup.php:530
 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:533
+#: ../../Zotlabs/Module/Setup.php:538
 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:537
+#: ../../Zotlabs/Module/Setup.php:542
 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:541
+#: ../../Zotlabs/Module/Setup.php:546
 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:545
+#: ../../Zotlabs/Module/Setup.php:550
 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:549
+#: ../../Zotlabs/Module/Setup.php:554
 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:553
+#: ../../Zotlabs/Module/Setup.php:558
 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:557
+#: ../../Zotlabs/Module/Setup.php:562
 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:575
+#: ../../Zotlabs/Module/Setup.php:580
 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:576
+#: ../../Zotlabs/Module/Setup.php:581
 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:577
+#: ../../Zotlabs/Module/Setup.php:582
 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:578
+#: ../../Zotlabs/Module/Setup.php:583
 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:581
+#: ../../Zotlabs/Module/Setup.php:586
 msgid ".htconfig.php is writable"
 msgstr ".htconfig.php tiene permisos de escritura"
 
-#: ../../Zotlabs/Module/Setup.php:595
+#: ../../Zotlabs/Module/Setup.php:600
 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:596
+#: ../../Zotlabs/Module/Setup.php:601
 #, 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."
 
-#: ../../Zotlabs/Module/Setup.php:597 ../../Zotlabs/Module/Setup.php:618
+#: ../../Zotlabs/Module/Setup.php:602 ../../Zotlabs/Module/Setup.php:623
 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:598
+#: ../../Zotlabs/Module/Setup.php:603
 #, 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:601
+#: ../../Zotlabs/Module/Setup.php:606
 #, php-format
 msgid "%s is writable"
 msgstr "%s tiene permisos de escritura"
 
-#: ../../Zotlabs/Module/Setup.php:617
+#: ../../Zotlabs/Module/Setup.php:622
 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:621
+#: ../../Zotlabs/Module/Setup.php:626
 msgid "store is writable"
 msgstr "\"store\" tiene permisos de escritura"
 
-#: ../../Zotlabs/Module/Setup.php:654
+#: ../../Zotlabs/Module/Setup.php:659
 msgid ""
 "SSL certificate cannot be validated. Fix certificate or disable https access"
 " to this site."
 msgstr "El certificado SSL no ha podido ser validado. Corrija este problema o desactive el acceso https a este sitio."
 
-#: ../../Zotlabs/Module/Setup.php:655
+#: ../../Zotlabs/Module/Setup.php:660
 msgid ""
 "If you have https access to your website or allow connections to TCP port "
 "443 (the https: port), you MUST use a browser-valid certificate. You MUST "
 "NOT use self-signed certificates!"
 msgstr "Si su servidor soporta conexiones cifradas SSL o si permite conexiones al puerto TCP 443 (el puerto usado por el protocolo https), debe utilizar un certificado válido. No debe usar un certificado firmado por usted mismo."
 
-#: ../../Zotlabs/Module/Setup.php:656
+#: ../../Zotlabs/Module/Setup.php:661
 msgid ""
 "This restriction is incorporated because public posts from you may for "
 "example contain references to images on your own hub."
 msgstr "Se ha incorporado esta restricción para evitar que sus publicaciones públicas hagan referencia a imágenes en su propio servidor."
 
-#: ../../Zotlabs/Module/Setup.php:657
+#: ../../Zotlabs/Module/Setup.php:662
 msgid ""
 "If your certificate is not recognized, members of other sites (who may "
 "themselves have valid certificates) will get a warning message on their own "
 "site complaining about security issues."
 msgstr "Si su certificado no ha sido reconocido, los miembros de otros sitios (con certificados válidos) recibirán mensajes de aviso en sus propios sitios web."
 
-#: ../../Zotlabs/Module/Setup.php:658
+#: ../../Zotlabs/Module/Setup.php:663
 msgid ""
 "This can cause usability issues elsewhere (not just on your own site) so we "
 "must insist on this requirement."
 msgstr "Por razones de compatibilidad (sobre el conjunto de la red, no solo sobre su propio sitio), debemos insistir en estos requisitos."
 
-#: ../../Zotlabs/Module/Setup.php:659
+#: ../../Zotlabs/Module/Setup.php:664
 msgid ""
 "Providers are available that issue free certificates which are browser-"
 "valid."
 msgstr "Existen varias Autoridades de Certificación que le pueden proporcionar certificados válidos."
 
-#: ../../Zotlabs/Module/Setup.php:661
+#: ../../Zotlabs/Module/Setup.php:666
 msgid "SSL certificate validation"
 msgstr "validación del certificado SSL"
 
-#: ../../Zotlabs/Module/Setup.php:667
+#: ../../Zotlabs/Module/Setup.php:672
 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:670
+#: ../../Zotlabs/Module/Setup.php:675
 msgid "Url rewrite is working"
 msgstr "La reescritura de las direcciones funciona correctamente"
 
-#: ../../Zotlabs/Module/Setup.php:679
+#: ../../Zotlabs/Module/Setup.php:684
 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:703
+#: ../../Zotlabs/Module/Setup.php:708
 msgid "Errors encountered creating database tables."
 msgstr "Se han encontrado errores al crear las tablas de la base de datos."
 
-#: ../../Zotlabs/Module/Setup.php:737
+#: ../../Zotlabs/Module/Setup.php:742
 msgid "<h1>What next</h1>"
 msgstr "<h1>Siguiente paso</h1>"
 
-#: ../../Zotlabs/Module/Setup.php:738
+#: ../../Zotlabs/Module/Setup.php:743
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the "
 "poller."
@@ -5982,11 +5935,11 @@ msgstr "Versión %s"
 
 #: ../../Zotlabs/Module/Siteinfo.php:40
 msgid "Installed plugins/addons/apps:"
-msgstr "Extensiones, complementos o aplicaciones instaladas:"
+msgstr "Extensiones (plugins), complementos o aplicaciones (apps) instaladas:"
 
 #: ../../Zotlabs/Module/Siteinfo.php:53
 msgid "No installed plugins/addons/apps"
-msgstr "No hay instalada ninguna extensión, complemento o aplicación"
+msgstr "No hay instalada ninguna extensión (plugin), complemento o aplicación (app)"
 
 #: ../../Zotlabs/Module/Siteinfo.php:66
 msgid ""
@@ -6034,70 +5987,76 @@ msgstr "Sugerencias, elogios, etc - por favor, un correo electrónico a \"redmat
 msgid "Site Administrators"
 msgstr "Administradores del sitio"
 
-#: ../../Zotlabs/Module/Sources.php:36
+#: ../../Zotlabs/Module/Sources.php:37
 msgid "Failed to create source. No channel selected."
 msgstr "Imposible crear el origen de los contenidos. Ningún canal ha sido seleccionado."
 
-#: ../../Zotlabs/Module/Sources.php:49
+#: ../../Zotlabs/Module/Sources.php:51
 msgid "Source created."
 msgstr "Fuente creada."
 
-#: ../../Zotlabs/Module/Sources.php:61
+#: ../../Zotlabs/Module/Sources.php:64
 msgid "Source updated."
 msgstr "Fuente actualizada."
 
-#: ../../Zotlabs/Module/Sources.php:86
+#: ../../Zotlabs/Module/Sources.php:90
 msgid "*"
 msgstr "*"
 
-#: ../../Zotlabs/Module/Sources.php:92 ../../include/features.php:71
-#: ../../include/widgets.php:581
+#: ../../Zotlabs/Module/Sources.php:96 ../../include/widgets.php:630
+#: ../../include/features.php:71
 msgid "Channel Sources"
 msgstr "Orígenes de los contenidos del canal"
 
-#: ../../Zotlabs/Module/Sources.php:93
+#: ../../Zotlabs/Module/Sources.php:97
 msgid "Manage remote sources of content for your channel."
 msgstr "Gestionar contenido de origen remoto para su canal."
 
-#: ../../Zotlabs/Module/Sources.php:94 ../../Zotlabs/Module/Sources.php:104
+#: ../../Zotlabs/Module/Sources.php:98 ../../Zotlabs/Module/Sources.php:108
 msgid "New Source"
 msgstr "Nueva fuente"
 
-#: ../../Zotlabs/Module/Sources.php:105 ../../Zotlabs/Module/Sources.php:137
+#: ../../Zotlabs/Module/Sources.php:109 ../../Zotlabs/Module/Sources.php:143
 msgid ""
 "Import all or selected content from the following channel into this channel "
 "and distribute it according to your channel settings."
 msgstr "Importar todo el contenido o una selección de los siguientes canales en este canal y distribuirlo de acuerdo con sus ajustes."
 
-#: ../../Zotlabs/Module/Sources.php:106 ../../Zotlabs/Module/Sources.php:138
+#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144
 msgid "Only import content with these words (one per line)"
 msgstr "Importar solo contenido que contenga estas palabras (una por línea)"
 
-#: ../../Zotlabs/Module/Sources.php:106 ../../Zotlabs/Module/Sources.php:138
+#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144
 msgid "Leave blank to import all public content"
 msgstr "Dejar en blanco para importar todo el contenido público"
 
-#: ../../Zotlabs/Module/Sources.php:107 ../../Zotlabs/Module/Sources.php:141
+#: ../../Zotlabs/Module/Sources.php:111 ../../Zotlabs/Module/Sources.php:148
 msgid "Channel Name"
 msgstr "Nombre del canal"
 
-#: ../../Zotlabs/Module/Sources.php:127 ../../Zotlabs/Module/Sources.php:154
+#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:147
+msgid ""
+"Add the following categories to posts imported from this source (comma "
+"separated)"
+msgstr "Añadir las categorías siguientes a las entradas importadas de esta fuente (separadas por comas)"
+
+#: ../../Zotlabs/Module/Sources.php:133 ../../Zotlabs/Module/Sources.php:161
 msgid "Source not found."
 msgstr "Fuente no encontrada"
 
-#: ../../Zotlabs/Module/Sources.php:134
+#: ../../Zotlabs/Module/Sources.php:140
 msgid "Edit Source"
 msgstr "Editar fuente"
 
-#: ../../Zotlabs/Module/Sources.php:135
+#: ../../Zotlabs/Module/Sources.php:141
 msgid "Delete Source"
 msgstr "Eliminar fuente"
 
-#: ../../Zotlabs/Module/Sources.php:162
+#: ../../Zotlabs/Module/Sources.php:169
 msgid "Source removed"
 msgstr "Fuente eliminada"
 
-#: ../../Zotlabs/Module/Sources.php:164
+#: ../../Zotlabs/Module/Sources.php:171
 msgid "Unable to remove source."
 msgstr "Imposible eliminar la fuente."
 
@@ -6125,8 +6084,8 @@ msgstr "Ignorar/Ocultar"
 msgid "post"
 msgstr "la entrada"
 
-#: ../../Zotlabs/Module/Tagger.php:57 ../../include/text.php:1948
-#: ../../include/conversation.php:150
+#: ../../Zotlabs/Module/Tagger.php:57 ../../include/conversation.php:150
+#: ../../include/text.php:1960
 msgid "comment"
 msgstr "el comentario"
 
@@ -6279,20 +6238,20 @@ msgstr "Ver conexiones"
 msgid "Source of Item"
 msgstr "Origen del elemento"
 
-#: ../../Zotlabs/Module/Webpages.php:186 ../../include/apps.php:136
-#: ../../include/conversation.php:1704 ../../include/nav.php:106
+#: ../../Zotlabs/Module/Webpages.php:184 ../../include/nav.php:106
+#: ../../include/conversation.php:1692 ../../include/apps.php:168
 msgid "Webpages"
 msgstr "Páginas web"
 
-#: ../../Zotlabs/Module/Webpages.php:197 ../../include/page_widgets.php:41
+#: ../../Zotlabs/Module/Webpages.php:195 ../../include/page_widgets.php:41
 msgid "Actions"
 msgstr "Acciones"
 
-#: ../../Zotlabs/Module/Webpages.php:198 ../../include/page_widgets.php:42
+#: ../../Zotlabs/Module/Webpages.php:196 ../../include/page_widgets.php:42
 msgid "Page Link"
 msgstr "Vínculo de la página"
 
-#: ../../Zotlabs/Module/Webpages.php:199
+#: ../../Zotlabs/Module/Webpages.php:197
 msgid "Page Title"
 msgstr "Título de página"
 
@@ -6308,11 +6267,11 @@ msgstr "Buscar un canal (o un \"webbie\") que comience por:"
 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:42 ../../include/import.php:44
+#: ../../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."
 
-#: ../../include/dba/dba_driver.php:141
+#: ../../include/dba/dba_driver.php:142
 #, 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�"
@@ -6354,148 +6313,148 @@ msgstr "No ha sido posible recuperar la identidad creada"
 msgid "Default Profile"
 msgstr "Perfil principal"
 
-#: ../../include/identity.php:784
+#: ../../include/identity.php:791
 msgid "Requested channel is not available."
 msgstr "El canal solicitado no está disponible."
 
-#: ../../include/identity.php:931
+#: ../../include/identity.php:938
 msgid "Create New Profile"
 msgstr "Crear un nuevo perfil"
 
-#: ../../include/identity.php:934 ../../include/nav.php:90
+#: ../../include/identity.php:941 ../../include/nav.php:90
 msgid "Edit Profile"
 msgstr "Editar el perfil"
 
-#: ../../include/identity.php:951
+#: ../../include/identity.php:958
 msgid "Visible to everybody"
 msgstr "Visible para todos"
 
-#: ../../include/identity.php:1026 ../../include/identity.php:1281
+#: ../../include/identity.php:1033 ../../include/identity.php:1288
 msgid "Gender:"
 msgstr "Género:"
 
-#: ../../include/identity.php:1027 ../../include/identity.php:1325
+#: ../../include/identity.php:1034 ../../include/identity.php:1332
 msgid "Status:"
 msgstr "Estado:"
 
-#: ../../include/identity.php:1028 ../../include/identity.php:1336
+#: ../../include/identity.php:1035 ../../include/identity.php:1343
 msgid "Homepage:"
 msgstr "Página personal:"
 
-#: ../../include/identity.php:1029
+#: ../../include/identity.php:1036
 msgid "Online Now"
 msgstr "Ahora en línea"
 
-#: ../../include/identity.php:1117 ../../include/identity.php:1193
+#: ../../include/identity.php:1124 ../../include/identity.php:1200
 msgid "F d"
 msgstr "d F"
 
-#: ../../include/identity.php:1173
+#: ../../include/identity.php:1180
 msgid "Birthday Reminders"
 msgstr "Recordatorios de cumpleaños"
 
-#: ../../include/identity.php:1174
+#: ../../include/identity.php:1181
 msgid "Birthdays this week:"
 msgstr "Cumpleaños de esta semana:"
 
-#: ../../include/identity.php:1225
+#: ../../include/identity.php:1232
 msgid "[No description]"
 msgstr "[Sin descripción]"
 
-#: ../../include/identity.php:1243
+#: ../../include/identity.php:1250
 msgid "Event Reminders"
 msgstr "Recordatorios de eventos"
 
-#: ../../include/identity.php:1244
+#: ../../include/identity.php:1251
 msgid "Events this week:"
 msgstr "Eventos de esta semana:"
 
-#: ../../include/identity.php:1286
+#: ../../include/identity.php:1293
 msgid "Like this channel"
 msgstr "Me gusta este canal"
 
-#: ../../include/identity.php:1310
+#: ../../include/identity.php:1317
 msgid "j F, Y"
 msgstr "j F Y"
 
-#: ../../include/identity.php:1311
+#: ../../include/identity.php:1318
 msgid "j F"
 msgstr "j F"
 
-#: ../../include/identity.php:1318
+#: ../../include/identity.php:1325
 msgid "Birthday:"
 msgstr "Cumpleaños:"
 
-#: ../../include/identity.php:1331
+#: ../../include/identity.php:1338
 #, php-format
 msgid "for %1$d %2$s"
 msgstr "por %1$d %2$s"
 
-#: ../../include/identity.php:1334
+#: ../../include/identity.php:1341
 msgid "Sexual Preference:"
 msgstr "Orientación sexual:"
 
-#: ../../include/identity.php:1340
+#: ../../include/identity.php:1347
 msgid "Tags:"
 msgstr "Etiquetas:"
 
-#: ../../include/identity.php:1342
+#: ../../include/identity.php:1349
 msgid "Political Views:"
 msgstr "Posición política:"
 
-#: ../../include/identity.php:1344
+#: ../../include/identity.php:1351
 msgid "Religion:"
 msgstr "Religión:"
 
-#: ../../include/identity.php:1348
+#: ../../include/identity.php:1355
 msgid "Hobbies/Interests:"
 msgstr "Aficciones o intereses:"
 
-#: ../../include/identity.php:1350
+#: ../../include/identity.php:1357
 msgid "Likes:"
 msgstr "Me gusta:"
 
-#: ../../include/identity.php:1352
+#: ../../include/identity.php:1359
 msgid "Dislikes:"
 msgstr "No me gusta:"
 
-#: ../../include/identity.php:1354
+#: ../../include/identity.php:1361
 msgid "Contact information and Social Networks:"
 msgstr "Información de contacto y redes sociales:"
 
-#: ../../include/identity.php:1356
+#: ../../include/identity.php:1363
 msgid "My other channels:"
 msgstr "Mis otros canales:"
 
-#: ../../include/identity.php:1358
+#: ../../include/identity.php:1365
 msgid "Musical interests:"
 msgstr "Preferencias musicales:"
 
-#: ../../include/identity.php:1360
+#: ../../include/identity.php:1367
 msgid "Books, literature:"
 msgstr "Libros, literatura:"
 
-#: ../../include/identity.php:1362
+#: ../../include/identity.php:1369
 msgid "Television:"
 msgstr "Televisión:"
 
-#: ../../include/identity.php:1364
+#: ../../include/identity.php:1371
 msgid "Film/dance/culture/entertainment:"
 msgstr "Cine, danza, cultura, entretenimiento:"
 
-#: ../../include/identity.php:1366
+#: ../../include/identity.php:1373
 msgid "Love/Romance:"
 msgstr "Vida sentimental o amorosa:"
 
-#: ../../include/identity.php:1368
+#: ../../include/identity.php:1375
 msgid "Work/employment:"
 msgstr "Trabajo:"
 
-#: ../../include/identity.php:1370
+#: ../../include/identity.php:1377
 msgid "School/education:"
 msgstr "Estudios:"
 
-#: ../../include/identity.php:1390
+#: ../../include/identity.php:1397
 msgid "Like this thing"
 msgstr "Me gusta esto"
 
@@ -6508,237 +6467,47 @@ msgstr "ha creado una nueva entrada"
 msgid "commented on %s's post"
 msgstr "ha comentado la entrada de %s"
 
-#: ../../include/ItemObject.php:89 ../../include/conversation.php:664
-msgid "Private Message"
-msgstr "Mensaje Privado"
+#: ../../include/oembed.php:324
+msgid "Embedded content"
+msgstr "Contenido incorporado"
 
-#: ../../include/ItemObject.php:126 ../../include/conversation.php:656
-msgid "Select"
-msgstr "Seleccionar"
+#: ../../include/oembed.php:333
+msgid "Embedding disabled"
+msgstr "Incrustación deshabilitada"
 
-#: ../../include/ItemObject.php:130
-msgid "Save to Folder"
-msgstr "Guardar en carpeta"
+#: ../../include/acl_selectors.php:236
+#: ../../include/PermissionDescription.php:31
+msgid "Visible to your default audience"
+msgstr "Visible para su público predeterminado."
 
-#: ../../include/ItemObject.php:151
-msgid "I will attend"
-msgstr "Participaré"
+#: ../../include/acl_selectors.php:274
+msgid "Limit access:"
+msgstr "Acceso limitado: "
 
-#: ../../include/ItemObject.php:151
-msgid "I will not attend"
-msgstr "No participaré"
+#: ../../include/acl_selectors.php:275
+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/ItemObject.php:151
-msgid "I might attend"
-msgstr "Quizá participe"
+#: ../../include/acl_selectors.php:276
+msgid "Show"
+msgstr "Mostrar"
 
-#: ../../include/ItemObject.php:161
-msgid "I agree"
-msgstr "Estoy de acuerdo"
+#: ../../include/acl_selectors.php:277
+msgid "Don't show"
+msgstr "No mostrar"
 
-#: ../../include/ItemObject.php:161
-msgid "I disagree"
-msgstr "No estoy de acuerdo"
+#: ../../include/acl_selectors.php:283
+msgid "Other networks and post services"
+msgstr "Otras redes y servicios de publicación"
 
-#: ../../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:328
-msgid "like"
-msgstr "me gusta"
-
-#: ../../include/ItemObject.php:255 ../../include/taxonomy.php:329
-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
+#: ../../include/acl_selectors.php:313
 #, 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"
-
-#: ../../include/ItemObject.php:319
-msgid "to"
-msgstr "a"
-
-#: ../../include/ItemObject.php:320
-msgid "via"
-msgstr "mediante"
-
-#: ../../include/ItemObject.php:321
-msgid "Wall-to-Wall"
-msgstr "De página del perfil a página del perfil (de \"muro\" a \"muro\")"
-
-#: ../../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/ItemObject.php:334 ../../include/conversation.php:719
-#, php-format
-msgid "from %s"
-msgstr "desde %s"
-
-#: ../../include/ItemObject.php:337 ../../include/conversation.php:722
-#, php-format
-msgid "last edited: %s"
-msgstr "último cambio: %s"
-
-#: ../../include/ItemObject.php:338 ../../include/conversation.php:723
-#, php-format
-msgid "Expires: %s"
-msgstr "Caduca: %s"
-
-#: ../../include/ItemObject.php:362 ../../bookmarker/bookmarker.php:45
-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:709
-msgid "Image"
-msgstr "Imagen"
-
-#: ../../include/ItemObject.php:710
-msgid "Insert Link"
-msgstr "Insertar enlace"
-
-#: ../../include/ItemObject.php:711
-msgid "Video"
-msgstr "Vídeo"
-
-#: ../../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:317 ../../include/account.php:344
-#: ../../include/account.php:404 ../../include/network.php:1875
-msgid "Administrator"
-msgstr "Administrador"
-
-#: ../../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/account.php:414
-msgid "Account approved."
-msgstr "Cuenta aprobada."
-
-#: ../../include/account.php:454
-#, 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 "
-
-#: ../../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."
+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/profile_selectors.php:6
 msgid "Currently Male"
@@ -6973,22 +6742,6 @@ msgstr "No me importa"
 msgid "Ask me"
 msgstr "Pregúnteme"
 
-#: ../../include/acl_selectors.php:218
-msgid "Visible to your default audience"
-msgstr "Visible para su público predeterminado."
-
-#: ../../include/acl_selectors.php:243
-msgid "Show"
-msgstr "Mostrar"
-
-#: ../../include/acl_selectors.php:244
-msgid "Don't show"
-msgstr "No mostrar"
-
-#: ../../include/acl_selectors.php:249
-msgid "Other networks and post services"
-msgstr "Otras redes y servicios de publicación"
-
 #: ../../include/activities.php:42
 msgid " and "
 msgstr "  y "
@@ -7012,310 +6765,146 @@ msgstr "Visitar %2$s de %1$s"
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr "%1$s ha actualizado %2$s, cambiando %3$s."
 
-#: ../../include/text.php:394
-msgid "prev"
-msgstr "anterior"
-
-#: ../../include/text.php:396
-msgid "first"
-msgstr "primera"
-
-#: ../../include/text.php:425
-msgid "last"
-msgstr "última"
-
-#: ../../include/text.php:428
-msgid "next"
-msgstr "próxima"
-
-#: ../../include/text.php:438
-msgid "older"
-msgstr "más antiguas"
-
-#: ../../include/text.php:440
-msgid "newer"
-msgstr "más recientes"
-
-#: ../../include/text.php:822
-msgid "No connections"
-msgstr "Sin conexiones"
-
-#: ../../include/text.php:847
+#: ../../include/contact_widgets.php:14
 #, php-format
-msgid "View all %s connections"
-msgstr "Ver todas las %s conexiones"
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] "%d invitación pendiente"
+msgstr[1] "%d invitaciones disponibles"
 
-#: ../../include/text.php:992 ../../include/text.php:997
-msgid "poke"
-msgstr "un toque"
+#: ../../include/contact_widgets.php:22
+msgid "Find Channels"
+msgstr "Encontrar canales"
 
-#: ../../include/text.php:992 ../../include/text.php:997
-#: ../../include/conversation.php:243
-msgid "poked"
-msgstr "ha dado un toque a"
+#: ../../include/contact_widgets.php:23
+msgid "Enter name or interest"
+msgstr "Introducir nombre o interés"
 
-#: ../../include/text.php:998
-msgid "ping"
-msgstr "un \"ping\""
+#: ../../include/contact_widgets.php:24
+msgid "Connect/Follow"
+msgstr "Conectar/Seguir"
 
-#: ../../include/text.php:998
-msgid "pinged"
-msgstr "ha enviado un \"ping\" a"
+#: ../../include/contact_widgets.php:25
+msgid "Examples: Robert Morgenstein, Fishing"
+msgstr "Ejemplos: José Fernández, Pesca"
 
-#: ../../include/text.php:999
-msgid "prod"
-msgstr "una incitación "
+#: ../../include/contact_widgets.php:29
+msgid "Random Profile"
+msgstr "Perfil aleatorio"
 
-#: ../../include/text.php:999
-msgid "prodded"
-msgstr "ha incitado a "
+#: ../../include/contact_widgets.php:30
+msgid "Invite Friends"
+msgstr "Invitar a amigos"
 
-#: ../../include/text.php:1000
-msgid "slap"
-msgstr "una bofetada "
+#: ../../include/contact_widgets.php:32
+msgid "Advanced example: name=fred and country=iceland"
+msgstr "Ejemplo avanzado: nombre=juan y país=españa"
 
-#: ../../include/text.php:1000
-msgid "slapped"
-msgstr "ha abofeteado a "
+#: ../../include/contact_widgets.php:57 ../../include/widgets.php:310
+#: ../../include/features.php:97
+msgid "Saved Folders"
+msgstr "Carpetas guardadas"
 
-#: ../../include/text.php:1001
-msgid "finger"
-msgstr "un \"finger\" "
+#: ../../include/contact_widgets.php:60 ../../include/contact_widgets.php:100
+#: ../../include/widgets.php:313 ../../include/widgets.php:432
+msgid "Everything"
+msgstr "Todo"
 
-#: ../../include/text.php:1001
-msgid "fingered"
-msgstr "envió un \"finger\" a"
+#: ../../include/contact_widgets.php:97 ../../include/widgets.php:46
+#: ../../include/widgets.php:429 ../../include/taxonomy.php:188
+#: ../../include/taxonomy.php:270
+msgid "Categories"
+msgstr "Categorías"
 
-#: ../../include/text.php:1002
-msgid "rebuff"
-msgstr "un reproche"
+#: ../../include/contact_widgets.php:130
+#, 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/text.php:1002
-msgid "rebuffed"
-msgstr "ha hecho un reproche a "
+#: ../../include/contact_widgets.php:135
+msgid "show more"
+msgstr "mostrar más"
 
-#: ../../include/text.php:1014
-msgid "happy"
-msgstr "feliz "
-
-#: ../../include/text.php:1015
-msgid "sad"
-msgstr "triste "
-
-#: ../../include/text.php:1016
-msgid "mellow"
-msgstr "tranquilo/a"
-
-#: ../../include/text.php:1017
-msgid "tired"
-msgstr "cansado/a "
-
-#: ../../include/text.php:1018
-msgid "perky"
-msgstr "vivaz"
-
-#: ../../include/text.php:1019
-msgid "angry"
-msgstr "enfadado/a"
-
-#: ../../include/text.php:1020
-msgid "stupefied"
-msgstr "asombrado/a"
-
-#: ../../include/text.php:1021
-msgid "puzzled"
-msgstr "perplejo/a"
-
-#: ../../include/text.php:1022
-msgid "interested"
-msgstr "interesado/a"
-
-#: ../../include/text.php:1023
-msgid "bitter"
-msgstr "amargado/a"
-
-#: ../../include/text.php:1024
-msgid "cheerful"
-msgstr "alegre"
-
-#: ../../include/text.php:1025
-msgid "alive"
-msgstr "animado/a"
-
-#: ../../include/text.php:1026
-msgid "annoyed"
-msgstr "molesto/a"
-
-#: ../../include/text.php:1027
-msgid "anxious"
-msgstr "ansioso/a"
-
-#: ../../include/text.php:1028
-msgid "cranky"
-msgstr "de mal humor"
-
-#: ../../include/text.php:1029
-msgid "disturbed"
-msgstr "perturbado/a"
-
-#: ../../include/text.php:1030
-msgid "frustrated"
-msgstr "frustrado/a"
-
-#: ../../include/text.php:1031
-msgid "depressed"
-msgstr "deprimido/a"
-
-#: ../../include/text.php:1032
-msgid "motivated"
-msgstr "motivado/a"
-
-#: ../../include/text.php:1033
-msgid "relaxed"
-msgstr "relajado/a"
-
-#: ../../include/text.php:1034
-msgid "surprised"
-msgstr "sorprendido/a"
-
-#: ../../include/text.php:1206 ../../include/js_strings.php:70
-msgid "Monday"
-msgstr "lunes"
-
-#: ../../include/text.php:1206 ../../include/js_strings.php:71
-msgid "Tuesday"
-msgstr "martes"
-
-#: ../../include/text.php:1206 ../../include/js_strings.php:72
-msgid "Wednesday"
-msgstr "miércoles"
-
-#: ../../include/text.php:1206 ../../include/js_strings.php:73
-msgid "Thursday"
-msgstr "jueves"
-
-#: ../../include/text.php:1206 ../../include/js_strings.php:74
-msgid "Friday"
-msgstr "viernes"
-
-#: ../../include/text.php:1206 ../../include/js_strings.php:75
-msgid "Saturday"
-msgstr "sábado"
-
-#: ../../include/text.php:1206 ../../include/js_strings.php:69
-msgid "Sunday"
-msgstr "domingo"
-
-#: ../../include/text.php:1210 ../../include/js_strings.php:45
-msgid "January"
-msgstr "enero"
-
-#: ../../include/text.php:1210 ../../include/js_strings.php:46
-msgid "February"
-msgstr "febrero"
-
-#: ../../include/text.php:1210 ../../include/js_strings.php:47
-msgid "March"
-msgstr "marzo"
-
-#: ../../include/text.php:1210 ../../include/js_strings.php:48
-msgid "April"
-msgstr "abril"
-
-#: ../../include/text.php:1210
-msgid "May"
-msgstr "mayo"
-
-#: ../../include/text.php:1210 ../../include/js_strings.php:50
-msgid "June"
-msgstr "junio"
-
-#: ../../include/text.php:1210 ../../include/js_strings.php:51
-msgid "July"
-msgstr "julio"
-
-#: ../../include/text.php:1210 ../../include/js_strings.php:52
-msgid "August"
-msgstr "agosto"
-
-#: ../../include/text.php:1210 ../../include/js_strings.php:53
-msgid "September"
-msgstr "septiembre"
-
-#: ../../include/text.php:1210 ../../include/js_strings.php:54
-msgid "October"
-msgstr "octubre"
-
-#: ../../include/text.php:1210 ../../include/js_strings.php:55
-msgid "November"
-msgstr "noviembre"
-
-#: ../../include/text.php:1210 ../../include/js_strings.php:56
-msgid "December"
-msgstr "diciembre"
-
-#: ../../include/text.php:1287 ../../include/text.php:1291
-msgid "Unknown Attachment"
-msgstr "Adjunto no reconocido"
-
-#: ../../include/text.php:1293
-msgid "unknown"
-msgstr "desconocido"
-
-#: ../../include/text.php:1329
-msgid "remove category"
-msgstr "eliminar categoría"
-
-#: ../../include/text.php:1406
-msgid "remove from file"
-msgstr "eliminar del fichero"
-
-#: ../../include/text.php:1437 ../../include/bb2diaspora.php:487
-#: ../../include/event.php:22
+#: ../../include/event.php:22 ../../include/text.php:1466
+#: ../../include/bb2diaspora.php:487
 msgid "l F d, Y \\@ g:i A"
 msgstr "l d de F, Y \\@ G:i"
 
-#: ../../include/text.php:1441 ../../include/bb2diaspora.php:493
-#: ../../include/event.php:30
+#: ../../include/event.php:30 ../../include/text.php:1470
+#: ../../include/bb2diaspora.php:493
 msgid "Starts:"
 msgstr "Comienza:"
 
-#: ../../include/text.php:1445 ../../include/bb2diaspora.php:501
-#: ../../include/event.php:40
+#: ../../include/event.php:40 ../../include/text.php:1474
+#: ../../include/bb2diaspora.php:501
 msgid "Finishes:"
 msgstr "Finaliza:"
 
-#: ../../include/text.php:1735 ../../include/text.php:1807
-msgid "default"
-msgstr "por defecto"
+#: ../../include/event.php:769
+msgid "This event has been added to your calendar."
+msgstr "Este evento ha sido añadido a su calendario."
 
-#: ../../include/text.php:1743
-msgid "Page layout"
-msgstr "Plantilla de la página"
+#: ../../include/event.php:968
+msgid "Not specified"
+msgstr "Sin especificar"
 
-#: ../../include/text.php:1743
-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/event.php:969
+msgid "Needs Action"
+msgstr "Necesita de una intervención"
 
-#: ../../include/text.php:1785
-msgid "Page content type"
-msgstr "Tipo de contenido de la página"
+#: ../../include/event.php:970
+msgid "Completed"
+msgstr "Completado/a"
 
-#: ../../include/text.php:1819
-msgid "Select an alternate language"
-msgstr "Seleccionar un idioma alternativo"
+#: ../../include/event.php:971
+msgid "In Process"
+msgstr "En proceso"
 
-#: ../../include/text.php:1953
-msgid "activity"
-msgstr "la actividad"
+#: ../../include/event.php:972
+msgid "Cancelled"
+msgstr "Cancelado/a"
 
-#: ../../include/text.php:2248
-msgid "Design Tools"
-msgstr "Herramientas de diseño web"
+#: ../../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/text.php:2254
-msgid "Pages"
-msgstr "Páginas"
+#: ../../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/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/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/zot.php:680
 msgid "Invalid data packet"
@@ -7325,408 +6914,272 @@ msgstr "Paquete de datos no válido"
 msgid "Unable to verify channel signature"
 msgstr "No ha sido posible de verificar la firma del canal"
 
-#: ../../include/zot.php:2332
+#: ../../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/zot.php:3670
+#: ../../include/zot.php:3680
 msgid "invalid target signature"
 msgstr "La firma recibida no es válida"
 
-#: ../../include/apps.php:128
-msgid "Site Admin"
-msgstr "Administrador del sitio"
+#: ../../include/widgets.php:103
+msgid "System"
+msgstr "Sistema"
 
-#: ../../include/apps.php:129 ../../include/conversation.php:1694
-#: ../../include/nav.php:102
-msgid "Bookmarks"
-msgstr "Marcadores"
+#: ../../include/widgets.php:106
+msgid "New App"
+msgstr "Nueva aplicación (app)"
 
-#: ../../include/apps.php:130
-msgid "Address Book"
-msgstr "Libreta de direcciones"
+#: ../../include/widgets.php:154
+msgid "Suggestions"
+msgstr "Sugerencias"
 
-#: ../../include/apps.php:131 ../../include/nav.php:110 ../../boot.php:1615
-msgid "Login"
-msgstr "Iniciar sesión"
+#: ../../include/widgets.php:155
+msgid "See more..."
+msgstr "Ver más..."
 
-#: ../../include/apps.php:133 ../../include/nav.php:179
-msgid "Grid"
-msgstr "Red"
+#: ../../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/apps.php:137 ../../include/nav.php:182
-msgid "Channel Home"
-msgstr "Mi canal"
+#: ../../include/widgets.php:181
+msgid "Add New Connection"
+msgstr "Añadir nueva conexión"
 
-#: ../../include/apps.php:140 ../../include/conversation.php:1667
-#: ../../include/conversation.php:1670 ../../include/nav.php:201
-msgid "Events"
-msgstr "Eventos"
+#: ../../include/widgets.php:182
+msgid "Enter channel address"
+msgstr "Dirección del canal"
 
-#: ../../include/apps.php:141 ../../include/nav.php:167
-msgid "Directory"
-msgstr "Directorio"
+#: ../../include/widgets.php:183
+msgid "Examples: bob@example.com, https://example.com/barbara"
+msgstr "Ejemplos: manuel@ejemplo.com, https://ejemplo.com/carmen"
 
-#: ../../include/apps.php:143 ../../include/nav.php:193
-msgid "Mail"
-msgstr "Correo"
+#: ../../include/widgets.php:199
+msgid "Notes"
+msgstr "Notas"
 
-#: ../../include/apps.php:146 ../../include/nav.php:96
-msgid "Chat"
-msgstr "Chat"
+#: ../../include/widgets.php:273
+msgid "Remove term"
+msgstr "Eliminar término"
 
-#: ../../include/apps.php:148
-msgid "Probe"
-msgstr "Probar"
+#: ../../include/widgets.php:281 ../../include/features.php:84
+msgid "Saved Searches"
+msgstr "Búsquedas guardadas"
 
-#: ../../include/apps.php:149
-msgid "Suggest"
-msgstr "Sugerir"
+#: ../../include/widgets.php:282 ../../include/group.php:316
+msgid "add"
+msgstr "añadir"
 
-#: ../../include/apps.php:150
-msgid "Random Channel"
-msgstr "Canal aleatorio"
+#: ../../include/widgets.php:354
+msgid "Archives"
+msgstr "Hemeroteca"
 
-#: ../../include/apps.php:151
-msgid "Invite"
-msgstr "Invitar"
+#: ../../include/widgets.php:516
+msgid "Refresh"
+msgstr "Recargar"
 
-#: ../../include/apps.php:152 ../../include/widgets.php:1338
-msgid "Features"
+#: ../../include/widgets.php:556
+msgid "Account settings"
+msgstr "Configuración de la cuenta"
+
+#: ../../include/widgets.php:562
+msgid "Channel settings"
+msgstr "Configuración del canal"
+
+#: ../../include/widgets.php:571
+msgid "Additional features"
 msgstr "Funcionalidades"
 
-#: ../../include/apps.php:154
-msgid "Post"
-msgstr "Publicación"
+#: ../../include/widgets.php:578
+msgid "Feature/Addon settings"
+msgstr "Complementos"
 
-#: ../../include/apps.php:252
-msgid "Install"
-msgstr "Instalar"
+#: ../../include/widgets.php:584
+msgid "Display settings"
+msgstr "Ajustes de visualización"
 
-#: ../../include/apps.php:257
-msgid "Purchase"
-msgstr "Comprar"
+#: ../../include/widgets.php:591
+msgid "Manage locations"
+msgstr "Gestión de ubicaciones (clones) del canal"
 
-#: ../../include/import.php:23
-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/widgets.php:600
+msgid "Export channel"
+msgstr "Exportar canal"
 
-#: ../../include/import.php:70
-msgid "Channel clone failed. Import failed."
-msgstr "La clonación del canal no ha salido bien. La importación ha fallado."
+#: ../../include/widgets.php:607
+msgid "Connected apps"
+msgstr "Aplicaciones (apps) conectadas"
 
-#: ../../include/bb2diaspora.php:398
-msgid "Attachments:"
-msgstr "Ficheros adjuntos:"
+#: ../../include/widgets.php:622
+msgid "Premium Channel Settings"
+msgstr "Configuración del canal premium"
 
-#: ../../include/bb2diaspora.php:489
-msgid "$Projectname event notification:"
-msgstr "Notificación de eventos de $Projectname:"
+#: ../../include/widgets.php:651
+msgid "Private Mail Menu"
+msgstr "Menú de correo privado"
 
-#: ../../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/widgets.php:653
+msgid "Combined View"
+msgstr "Vista combinada"
 
-#: ../../include/conversation.php:239
-#, php-format
-msgid "%1$s poked %2$s"
-msgstr "%1$s ha dado un toque a %2$s"
+#: ../../include/widgets.php:658 ../../include/nav.php:196
+msgid "Inbox"
+msgstr "Bandeja de entrada"
 
-#: ../../include/conversation.php:691
-#, php-format
-msgid "View %s's profile @ %s"
-msgstr "Ver el perfil @ %s de %s"
+#: ../../include/widgets.php:663 ../../include/nav.php:197
+msgid "Outbox"
+msgstr "Bandeja de salida"
 
-#: ../../include/conversation.php:710
-msgid "Categories:"
-msgstr "Categorías:"
+#: ../../include/widgets.php:668 ../../include/nav.php:198
+msgid "New Message"
+msgstr "Nuevo mensaje"
 
-#: ../../include/conversation.php:711
-msgid "Filed under:"
-msgstr "Archivado bajo:"
+#: ../../include/widgets.php:685 ../../include/widgets.php:697
+msgid "Conversations"
+msgstr "Conversaciones"
 
-#: ../../include/conversation.php:738
-msgid "View in context"
-msgstr "Mostrar en su contexto"
+#: ../../include/widgets.php:689
+msgid "Received Messages"
+msgstr "Mensajes recibidos"
 
-#: ../../include/conversation.php:850
-msgid "remove"
-msgstr "eliminar"
+#: ../../include/widgets.php:693
+msgid "Sent Messages"
+msgstr "Enviar mensajes"
 
-#: ../../include/conversation.php:854 ../../include/nav.php:247
-msgid "Loading..."
-msgstr "Cargando..."
+#: ../../include/widgets.php:707
+msgid "No messages."
+msgstr "Sin mensajes."
 
-#: ../../include/conversation.php:855
-msgid "Delete Selected Items"
-msgstr "Eliminar elementos seleccionados"
+#: ../../include/widgets.php:725
+msgid "Delete conversation"
+msgstr "Eliminar conversación"
 
-#: ../../include/conversation.php:953
-msgid "View Source"
-msgstr "Ver la fuente original de la publicación"
+#: ../../include/widgets.php:751
+msgid "Events Menu"
+msgstr "Menú de eventos"
 
-#: ../../include/conversation.php:954
-msgid "Follow Thread"
-msgstr "Seguir este hilo"
+#: ../../include/widgets.php:752
+msgid "Day View"
+msgstr "Eventos del día"
 
-#: ../../include/conversation.php:955
-msgid "Unfollow Thread"
-msgstr "Dejar de seguir este hilo"
+#: ../../include/widgets.php:753
+msgid "Week View"
+msgstr "Eventos de la semana"
 
-#: ../../include/conversation.php:960
-msgid "Activity/Posts"
-msgstr "Actividad y publicaciones"
+#: ../../include/widgets.php:754
+msgid "Month View"
+msgstr "Eventos del mes"
 
-#: ../../include/conversation.php:962
-msgid "Edit Connection"
-msgstr "Editar conexión"
+#: ../../include/widgets.php:766
+msgid "Events Tools"
+msgstr "Gestión de eventos"
 
-#: ../../include/conversation.php:963
-msgid "Message"
-msgstr "Mensaje"
+#: ../../include/widgets.php:767
+msgid "Export Calendar"
+msgstr "Exportar el calendario"
 
-#: ../../include/conversation.php:1080
-#, php-format
-msgid "%s likes this."
-msgstr "A %s le gusta esto."
+#: ../../include/widgets.php:768
+msgid "Import Calendar"
+msgstr "Importar un calendario"
 
-#: ../../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:1169
-msgid "Visible to <strong>everybody</strong>"
-msgstr "Visible para <strong>cualquiera</strong>"
-
-#: ../../include/conversation.php:1171
-msgid "Please enter a video link/URL:"
-msgstr "Por favor, introduzca un enlace de vídeo:"
-
-#: ../../include/conversation.php:1172
-msgid "Please enter an audio link/URL:"
-msgstr "Por favor, introduzca un enlace de audio:"
-
-#: ../../include/conversation.php:1173
-msgid "Tag term:"
-msgstr "Término de la etiqueta:"
-
-#: ../../include/conversation.php:1175
-msgid "Where are you right now?"
-msgstr "¿Donde está ahora?"
-
-#: ../../include/conversation.php:1211
-msgid "Page link name"
-msgstr "Nombre del enlace de la página"
-
-#: ../../include/conversation.php:1214
-msgid "Post as"
-msgstr "Publicar como"
-
-#: ../../include/conversation.php:1222
-msgid "upload photo"
-msgstr "subir foto"
-
-#: ../../include/conversation.php:1224
-msgid "attach file"
-msgstr "adjuntar fichero"
-
-#: ../../include/conversation.php:1226
-msgid "web link"
-msgstr "enlace web"
-
-#: ../../include/conversation.php:1227
-msgid "Insert video link"
-msgstr "Insertar enlace de vídeo"
-
-#: ../../include/conversation.php:1228
-msgid "video link"
-msgstr "enlace de vídeo"
-
-#: ../../include/conversation.php:1229
-msgid "Insert audio link"
-msgstr "Insertar enlace de audio"
-
-#: ../../include/conversation.php:1230
-msgid "audio link"
-msgstr "enlace de audio"
-
-#: ../../include/conversation.php:1232
-msgid "set location"
-msgstr "establecer ubicación"
-
-#: ../../include/conversation.php:1237
-msgid "clear location"
-msgstr "borrar los datos de ubicación"
-
-#: ../../include/conversation.php:1246
-msgid "permissions"
-msgstr "permisos"
-
-#: ../../include/conversation.php:1272
-msgid "Set publish date"
-msgstr "Establecer la fecha de publicación"
-
-#: ../../include/conversation.php:1521
-msgid "Discover"
-msgstr "Descubrir"
-
-#: ../../include/conversation.php:1524
-msgid "Imported public streams"
-msgstr "Contenidos públicos importados"
-
-#: ../../include/conversation.php:1529
-msgid "Commented Order"
-msgstr "Comentarios recientes"
-
-#: ../../include/conversation.php:1532
-msgid "Sort by Comment Date"
-msgstr "Ordenar por fecha de comentario"
-
-#: ../../include/conversation.php:1536
-msgid "Posted Order"
-msgstr "Publicaciones recientes"
-
-#: ../../include/conversation.php:1539
-msgid "Sort by Post Date"
-msgstr "Ordenar por fecha de publicación"
-
-#: ../../include/conversation.php:1547
-msgid "Posts that mention or involve you"
-msgstr "Publicaciones que le mencionan o involucran"
-
-#: ../../include/conversation.php:1556
-msgid "Activity Stream - by date"
-msgstr "Contenido - por fecha"
-
-#: ../../include/conversation.php:1562
-msgid "Starred"
-msgstr "Preferidas"
-
-#: ../../include/conversation.php:1565
-msgid "Favourite Posts"
-msgstr "Publicaciones favoritas"
-
-#: ../../include/conversation.php:1572
-msgid "Spam"
-msgstr "Correo basura"
-
-#: ../../include/conversation.php:1575
-msgid "Posts flagged as SPAM"
-msgstr "Publicaciones marcadas como basura"
-
-#: ../../include/conversation.php:1632
-msgid "Status Messages and Posts"
-msgstr "Mensajes de estado y publicaciones"
-
-#: ../../include/conversation.php:1641
-msgid "About"
-msgstr "Mi perfil"
-
-#: ../../include/conversation.php:1644
-msgid "Profile Details"
-msgstr "Detalles del perfil"
-
-#: ../../include/conversation.php:1653 ../../include/photos.php:506
-msgid "Photo Albums"
-msgstr "�lbumes de fotos"
-
-#: ../../include/conversation.php:1660
-msgid "Files and Storage"
-msgstr "Ficheros y repositorio"
-
-#: ../../include/conversation.php:1681 ../../include/conversation.php:1684
-#: ../../include/widgets.php:794
+#: ../../include/widgets.php:843 ../../include/conversation.php:1669
+#: ../../include/conversation.php:1672
 msgid "Chatrooms"
 msgstr "Salas de chat"
 
-#: ../../include/conversation.php:1697
-msgid "Saved Bookmarks"
-msgstr "Marcadores guardados"
+#: ../../include/widgets.php:847
+msgid "Overview"
+msgstr "Resumen"
 
-#: ../../include/conversation.php:1707
-msgid "Manage Webpages"
-msgstr "Administrar páginas web"
+#: ../../include/widgets.php:854
+msgid "Chat Members"
+msgstr "Miembros del chat"
 
-#: ../../include/conversation.php:1766
-msgctxt "noun"
-msgid "Attending"
-msgid_plural "Attending"
-msgstr[0] "Participaré"
-msgstr[1] "Participaré"
+#: ../../include/widgets.php:877
+msgid "Bookmarked Chatrooms"
+msgstr "Salas de chat preferidas"
 
-#: ../../include/conversation.php:1769
-msgctxt "noun"
-msgid "Not Attending"
-msgid_plural "Not Attending"
-msgstr[0] "No participaré"
-msgstr[1] "No participaré"
+#: ../../include/widgets.php:900
+msgid "Suggested Chatrooms"
+msgstr "Salas de chat sugeridas"
 
-#: ../../include/conversation.php:1772
-msgctxt "noun"
-msgid "Undecided"
-msgid_plural "Undecided"
-msgstr[0] "Indeciso/a"
-msgstr[1] "Indecisos/as"
+#: ../../include/widgets.php:1045 ../../include/widgets.php:1157
+msgid "photo/image"
+msgstr "foto/imagen"
 
-#: ../../include/conversation.php:1775
-msgctxt "noun"
-msgid "Agree"
-msgid_plural "Agrees"
-msgstr[0] "De acuerdo"
-msgstr[1] "De acuerdo"
+#: ../../include/widgets.php:1100
+msgid "Click to show more"
+msgstr "Hacer clic para ver más"
 
-#: ../../include/conversation.php:1778
-msgctxt "noun"
-msgid "Disagree"
-msgid_plural "Disagrees"
-msgstr[0] "En desacuerdo"
-msgstr[1] "En desacuerdo"
+#: ../../include/widgets.php:1251
+msgid "Rating Tools"
+msgstr "Valoraciones"
 
-#: ../../include/conversation.php:1781
-msgctxt "noun"
-msgid "Abstain"
-msgid_plural "Abstains"
-msgstr[0] "se abstiene"
-msgstr[1] "Se abstienen"
+#: ../../include/widgets.php:1255 ../../include/widgets.php:1257
+msgid "Rate Me"
+msgstr "Valorar este canal"
+
+#: ../../include/widgets.php:1260
+msgid "View Ratings"
+msgstr "Mostrar las valoraciones"
+
+#: ../../include/widgets.php:1317
+msgid "Forums"
+msgstr "Foros"
+
+#: ../../include/widgets.php:1346
+msgid "Tasks"
+msgstr "Tareas"
+
+#: ../../include/widgets.php:1355
+msgid "Documentation"
+msgstr "Documentación"
+
+#: ../../include/widgets.php:1357
+msgid "Project/Site Information"
+msgstr "Información sobre el proyecto o sitio"
+
+#: ../../include/widgets.php:1358
+msgid "For Members"
+msgstr "Para los miembros"
+
+#: ../../include/widgets.php:1359
+msgid "For Administrators"
+msgstr "Para los administradores"
+
+#: ../../include/widgets.php:1360
+msgid "For Developers"
+msgstr "Para los desarrolladores"
+
+#: ../../include/widgets.php:1384
+msgid "Accounts"
+msgstr "Cuentas"
+
+#: ../../include/widgets.php:1384 ../../include/widgets.php:1422
+msgid "Member registrations waiting for confirmation"
+msgstr "Inscripciones de nuevos miembros pendientes de aprobación"
+
+#: ../../include/widgets.php:1387 ../../include/apps.php:184
+msgid "Features"
+msgstr "Funcionalidades"
+
+#: ../../include/widgets.php:1390
+msgid "Inspect queue"
+msgstr "Examinar la cola"
+
+#: ../../include/widgets.php:1392
+msgid "DB updates"
+msgstr "Actualizaciones de la base de datos"
+
+#: ../../include/widgets.php:1417 ../../include/nav.php:216
+msgid "Admin"
+msgstr "Administrador"
+
+#: ../../include/widgets.php:1418
+msgid "Plugin Features"
+msgstr "Extensiones"
 
 #: ../../include/bookmarks.php:35
 #, php-format
@@ -7780,9 +7233,287 @@ 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/api.php:1338
-msgid "Public Timeline"
-msgstr "Cronología pública"
+#: ../../include/items.php:890 ../../include/items.php:935
+msgid "(Unknown)"
+msgstr "(Desconocido)"
+
+#: ../../include/items.php:1134
+msgid "Visible to anybody on the internet."
+msgstr "Visible para cualquiera en internet."
+
+#: ../../include/items.php:1136
+msgid "Visible to you only."
+msgstr "Visible sólo para usted."
+
+#: ../../include/items.php:1138
+msgid "Visible to anybody in this network."
+msgstr "Visible para cualquiera en esta red."
+
+#: ../../include/items.php:1140
+msgid "Visible to anybody authenticated."
+msgstr "Visible para cualquiera que haya sido autenticado."
+
+#: ../../include/items.php:1142
+#, php-format
+msgid "Visible to anybody on %s."
+msgstr "Visible para cualquiera en %s."
+
+#: ../../include/items.php:1144
+msgid "Visible to all connections."
+msgstr "Visible para todas las conexiones."
+
+#: ../../include/items.php:1146
+msgid "Visible to approved connections."
+msgstr "Visible para las conexiones permitidas."
+
+#: ../../include/items.php:1148
+msgid "Visible to specific connections."
+msgstr "Visible para conexiones específicas."
+
+#: ../../include/items.php:3910
+msgid "Privacy group is empty."
+msgstr "El grupo de canales está vacío."
+
+#: ../../include/items.php:3917
+#, php-format
+msgid "Privacy group: %s"
+msgstr "Grupo de canales: %s"
+
+#: ../../include/items.php:3929
+msgid "Connection not found."
+msgstr "Conexión no encontrada"
+
+#: ../../include/items.php:4278
+msgid "profile photo"
+msgstr "foto del perfil"
+
+#: ../../include/nav.php:82 ../../include/nav.php:113 ../../boot.php:1614
+msgid "Logout"
+msgstr "Finalizar sesión"
+
+#: ../../include/nav.php:82 ../../include/nav.php:113
+msgid "End this session"
+msgstr "Finalizar esta sesión"
+
+#: ../../include/nav.php:85 ../../include/nav.php:144
+msgid "Home"
+msgstr "Inicio"
+
+#: ../../include/nav.php:85
+msgid "Your posts and conversations"
+msgstr "Sus publicaciones y conversaciones"
+
+#: ../../include/nav.php:86
+msgid "Your profile page"
+msgstr "Su página del perfil"
+
+#: ../../include/nav.php:88
+msgid "Manage/Edit profiles"
+msgstr "Administrar/editar perfiles"
+
+#: ../../include/nav.php:90
+msgid "Edit your profile"
+msgstr "Editar su perfil"
+
+#: ../../include/nav.php:92
+msgid "Your photos"
+msgstr "Sus fotos"
+
+#: ../../include/nav.php:93
+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"
+
+#: ../../include/nav.php:106
+msgid "Your webpages"
+msgstr "Sus páginas web"
+
+#: ../../include/nav.php:110 ../../include/apps.php:163 ../../boot.php:1615
+msgid "Login"
+msgstr "Iniciar sesión"
+
+#: ../../include/nav.php:110
+msgid "Sign in"
+msgstr "Acceder"
+
+#: ../../include/nav.php:127
+#, php-format
+msgid "%s - click to logout"
+msgstr "%s - pulsar para finalizar sesión"
+
+#: ../../include/nav.php:130
+msgid "Remote authentication"
+msgstr "Acceder desde su servidor"
+
+#: ../../include/nav.php:130
+msgid "Click to authenticate to your home hub"
+msgstr "Pulsar para identificarse en su servidor de inicio"
+
+#: ../../include/nav.php:144
+msgid "Home Page"
+msgstr "Página de inicio"
+
+#: ../../include/nav.php:147
+msgid "Create an account"
+msgstr "Crear una cuenta"
+
+#: ../../include/nav.php:159
+msgid "Help and documentation"
+msgstr "Ayuda y documentación"
+
+#: ../../include/nav.php:163
+msgid "Applications, utilities, links, games"
+msgstr "Aplicaciones, utilidades, enlaces, juegos"
+
+#: ../../include/nav.php:165
+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"
+
+#: ../../include/nav.php:180
+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"
+
+#: ../../include/nav.php:183
+msgid "Mark all channel notifications seen"
+msgstr "Marcar todas las notificaciones del canal como leídas"
+
+#: ../../include/nav.php:189
+msgid "Notices"
+msgstr "Avisos"
+
+#: ../../include/nav.php:189
+msgid "Notifications"
+msgstr "Notificaciones"
+
+#: ../../include/nav.php:190
+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"
+
+#: ../../include/nav.php:194
+msgid "See all private messages"
+msgstr "Ver todas los mensajes privados"
+
+#: ../../include/nav.php:195
+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:201
+msgid "Event Calendar"
+msgstr "Calendario de eventos"
+
+#: ../../include/nav.php:202
+msgid "See all events"
+msgstr "Ver todos los eventos"
+
+#: ../../include/nav.php:203
+msgid "Mark all events seen"
+msgstr "Marcar todos los eventos como leidos"
+
+#: ../../include/nav.php:206
+msgid "Manage Your Channels"
+msgstr "Gestionar sus canales"
+
+#: ../../include/nav.php:208
+msgid "Account/Channel Settings"
+msgstr "Ajustes de cuenta/canales"
+
+#: ../../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"
+
+#: ../../include/nav.php:253
+msgid "Please wait..."
+msgstr "Espere por favor…"
+
+#: ../../include/network.php:659
+msgid "view full size"
+msgstr "Ver en el tamaño original"
+
+#: ../../include/network.php:1827 ../../include/enotify.php:57
+msgid "$Projectname Notification"
+msgstr "Notificación de $Projectname"
+
+#: ../../include/network.php:1828 ../../include/enotify.php:58
+msgid "$projectname"
+msgstr "$projectname"
+
+#: ../../include/network.php:1830 ../../include/enotify.php:60
+msgid "Thank You,"
+msgstr "Gracias,"
+
+#: ../../include/network.php:1832 ../../include/enotify.php:62
+#, php-format
+msgid "%s Administrator"
+msgstr "%s Administrador"
+
+#: ../../include/network.php:1875 ../../include/account.php:317
+#: ../../include/account.php:344 ../../include/account.php:404
+msgid "Administrator"
+msgstr "Administrador"
+
+#: ../../include/network.php:1889
+msgid "No Subject"
+msgstr "Sin asunto"
 
 #: ../../include/contact_selectors.php:56
 msgid "Frequently"
@@ -7849,67 +7580,6 @@ msgstr "XMPP/IM"
 msgid "MySpace"
 msgstr "MySpace"
 
-#: ../../include/contact_widgets.php:14
-#, 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
-msgid "Find Channels"
-msgstr "Encontrar canales"
-
-#: ../../include/contact_widgets.php:23
-msgid "Enter name or interest"
-msgstr "Introducir nombre o interés"
-
-#: ../../include/contact_widgets.php:24
-msgid "Connect/Follow"
-msgstr "Conectar/Seguir"
-
-#: ../../include/contact_widgets.php:25
-msgid "Examples: Robert Morgenstein, Fishing"
-msgstr "Ejemplos: José Fernández, Pesca"
-
-#: ../../include/contact_widgets.php:29
-msgid "Random Profile"
-msgstr "Perfil aleatorio"
-
-#: ../../include/contact_widgets.php:30
-msgid "Invite Friends"
-msgstr "Invitar a amigos"
-
-#: ../../include/contact_widgets.php:32
-msgid "Advanced example: name=fred and country=iceland"
-msgstr "Ejemplo avanzado: nombre=juan y país=españa"
-
-#: ../../include/contact_widgets.php:57 ../../include/features.php:97
-#: ../../include/widgets.php:310
-msgid "Saved Folders"
-msgstr "Carpetas guardadas"
-
-#: ../../include/contact_widgets.php:60 ../../include/contact_widgets.php:98
-#: ../../include/widgets.php:313
-msgid "Everything"
-msgstr "Todo"
-
-#: ../../include/contact_widgets.php:95 ../../include/widgets.php:46
-#: ../../include/taxonomy.php:282
-msgid "Categories"
-msgstr "Categorías"
-
-#: ../../include/contact_widgets.php:128
-#, 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:133
-msgid "show more"
-msgstr "mostrar más"
-
 #: ../../include/attach.php:247 ../../include/attach.php:333
 msgid "Item was not found."
 msgstr "Elemento no encontrado."
@@ -7984,7 +7654,7 @@ msgstr "Edad:"
 msgid "YYYY-MM-DD or MM-DD"
 msgstr "AAAA-MM-DD o MM-DD"
 
-#: ../../include/datetime.php:273 ../../boot.php:2445
+#: ../../include/datetime.php:273 ../../boot.php:2463
 msgid "never"
 msgstr "nunca"
 
@@ -8073,23 +7743,6 @@ msgstr "Solo foros públicos"
 msgid "This Website Only"
 msgstr "Solo este sitio web"
 
-#: ../../include/enotify.php:57 ../../include/network.php:1827
-msgid "$Projectname Notification"
-msgstr "Notificación de $Projectname"
-
-#: ../../include/enotify.php:58 ../../include/network.php:1828
-msgid "$projectname"
-msgstr "$projectname"
-
-#: ../../include/enotify.php:60 ../../include/network.php:1830
-msgid "Thank You,"
-msgstr "Gracias,"
-
-#: ../../include/enotify.php:62 ../../include/network.php:1832
-#, php-format
-msgid "%s Administrator"
-msgstr "%s Administrador"
-
 #: ../../include/enotify.php:96
 #, php-format
 msgid "%s <!item_type!>"
@@ -8269,29 +7922,180 @@ msgstr "Por favor, visite %s para aprobar o rechazar la sugerencia."
 msgid "[Hubzilla:Notify]"
 msgstr "[Hubzilla:Aviso]"
 
-#: ../../include/event.php:779
-msgid "This event has been added to your calendar."
-msgstr "Este evento ha sido añadido a su calendario."
+#: ../../include/ItemObject.php:89 ../../include/conversation.php:664
+msgid "Private Message"
+msgstr "Mensaje Privado"
 
-#: ../../include/event.php:978
-msgid "Not specified"
-msgstr "Sin especificar"
+#: ../../include/ItemObject.php:126 ../../include/conversation.php:656
+msgid "Select"
+msgstr "Seleccionar"
 
-#: ../../include/event.php:979
-msgid "Needs Action"
-msgstr "Necesita de una intervención"
+#: ../../include/ItemObject.php:130
+msgid "Save to Folder"
+msgstr "Guardar en carpeta"
 
-#: ../../include/event.php:980
-msgid "Completed"
-msgstr "Completado/a"
+#: ../../include/ItemObject.php:151
+msgid "I will attend"
+msgstr "Participaré"
 
-#: ../../include/event.php:981
-msgid "In Process"
-msgstr "En proceso"
+#: ../../include/ItemObject.php:151
+msgid "I will not attend"
+msgstr "No participaré"
 
-#: ../../include/event.php:982
-msgid "Cancelled"
-msgstr "Cancelado/a"
+#: ../../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"
+
+#: ../../include/ItemObject.php:319
+msgid "to"
+msgstr "a"
+
+#: ../../include/ItemObject.php:320
+msgid "via"
+msgstr "mediante"
+
+#: ../../include/ItemObject.php:321
+msgid "Wall-to-Wall"
+msgstr "De página del perfil a página del perfil (de \"muro\" a \"muro\")"
+
+#: ../../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/ItemObject.php:334 ../../include/conversation.php:719
+#, php-format
+msgid "from %s"
+msgstr "desde %s"
+
+#: ../../include/ItemObject.php:337 ../../include/conversation.php:722
+#, php-format
+msgid "last edited: %s"
+msgstr "último cambio: %s"
+
+#: ../../include/ItemObject.php:338 ../../include/conversation.php:723
+#, 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"
 
 #: ../../include/features.php:48
 msgid "General Features"
@@ -8480,10 +8284,6 @@ msgstr "Grupos de canales"
 msgid "Enable management and selection of privacy groups"
 msgstr "Activar la gestión y selección de grupos de canales"
 
-#: ../../include/features.php:84 ../../include/widgets.php:281
-msgid "Saved Searches"
-msgstr "Búsquedas guardadas"
-
 #: ../../include/features.php:84
 msgid "Save search terms for re-use"
 msgstr "Guardar términos de búsqueda para su reutilización"
@@ -8520,7 +8320,7 @@ 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/features.php:89 ../../include/apps.php:162
 msgid "Suggest Channels"
 msgstr "Sugerir canales"
 
@@ -8631,21 +8431,17 @@ msgstr "Añadir un grupo de canales"
 msgid "Channels not in any privacy group"
 msgstr "Sin canales en ningún grupo"
 
-#: ../../include/group.php:316 ../../include/widgets.php:282
-msgid "add"
-msgstr "añadir"
-
-#: ../../include/bbcode.php:123 ../../include/bbcode.php:813
-#: ../../include/bbcode.php:816 ../../include/bbcode.php:821
-#: ../../include/bbcode.php:824 ../../include/bbcode.php:827
-#: ../../include/bbcode.php:830 ../../include/bbcode.php:835
-#: ../../include/bbcode.php:838 ../../include/bbcode.php:843
-#: ../../include/bbcode.php:846 ../../include/bbcode.php:849
-#: ../../include/bbcode.php:852
+#: ../../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:863
+#: ../../include/bbcode.php:162 ../../include/bbcode.php:898
 msgid "Encrypted content"
 msgstr "Contenido cifrado"
 
@@ -8674,353 +8470,723 @@ msgstr "Pulsar para abrir/cerrar"
 msgid "spoiler"
 msgstr "spoiler"
 
-#: ../../include/bbcode.php:556
+#: ../../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:801
+#: ../../include/bbcode.php:836
 msgid "$1 wrote:"
 msgstr "$1 escribió:"
 
-#: ../../include/items.php:1138 ../../include/items.php:1183
-msgid "(Unknown)"
-msgstr "(Desconocido)"
-
-#: ../../include/items.php:1382
-msgid "Visible to anybody on the internet."
-msgstr "Visible para cualquiera en internet."
-
-#: ../../include/items.php:1384
-msgid "Visible to you only."
-msgstr "Visible sólo para usted."
-
-#: ../../include/items.php:1386
-msgid "Visible to anybody in this network."
-msgstr "Visible para cualquiera en esta red."
-
-#: ../../include/items.php:1388
-msgid "Visible to anybody authenticated."
-msgstr "Visible para cualquiera que haya sido autenticado."
-
-#: ../../include/items.php:1390
+#: ../../include/conversation.php:204
 #, php-format
-msgid "Visible to anybody on %s."
-msgstr "Visible para cualquiera en %s."
+msgid "%1$s is now connected with %2$s"
+msgstr "%1$s ahora está conectado/a con %2$s"
 
-#: ../../include/items.php:1392
-msgid "Visible to all connections."
-msgstr "Visible para todas las conexiones."
-
-#: ../../include/items.php:1394
-msgid "Visible to approved connections."
-msgstr "Visible para las conexiones permitidas."
-
-#: ../../include/items.php:1396
-msgid "Visible to specific connections."
-msgstr "Visible para conexiones específicas."
-
-#: ../../include/items.php:5142
-msgid "Privacy group is empty."
-msgstr "El grupo de canales está vacío."
-
-#: ../../include/items.php:5149
+#: ../../include/conversation.php:239
 #, php-format
-msgid "Privacy group: %s"
-msgstr "Grupo de canales: %s"
+msgid "%1$s poked %2$s"
+msgstr "%1$s ha dado un toque a %2$s"
 
-#: ../../include/items.php:5161
-msgid "Connection not found."
-msgstr "Conexión no encontrada"
+#: ../../include/conversation.php:243 ../../include/text.php:1021
+#: ../../include/text.php:1026
+msgid "poked"
+msgstr "ha dado un toque a"
 
-#: ../../include/items.php:5594
-msgid "profile photo"
-msgstr "foto del perfil"
-
-#: ../../include/network.php:659
-msgid "view full size"
-msgstr "Ver en el tamaño original"
-
-#: ../../include/network.php:1889
-msgid "No Subject"
-msgstr "Sin asunto"
-
-#: ../../include/widgets.php:103
-msgid "System"
-msgstr "Sistema"
-
-#: ../../include/widgets.php:106
-msgid "Create Personal App"
-msgstr "Crear una aplicación personal"
-
-#: ../../include/widgets.php:107
-msgid "Edit Personal App"
-msgstr "Editar una aplicación personal"
-
-#: ../../include/widgets.php:154
-msgid "Suggestions"
-msgstr "Sugerencias"
-
-#: ../../include/widgets.php:155
-msgid "See more..."
-msgstr "Ver más..."
-
-#: ../../include/widgets.php:175
+#: ../../include/conversation.php:691
 #, php-format
-msgid "You have %1$.0f of %2$.0f allowed connections."
-msgstr "Tiene %1$.0f de %2$.0f conexiones permitidas."
+msgid "View %s's profile @ %s"
+msgstr "Ver el perfil @ %s de %s"
 
-#: ../../include/widgets.php:181
-msgid "Add New Connection"
-msgstr "Añadir nueva conexión"
+#: ../../include/conversation.php:710
+msgid "Categories:"
+msgstr "Categorías:"
 
-#: ../../include/widgets.php:182
-msgid "Enter channel address"
-msgstr "Dirección del canal"
+#: ../../include/conversation.php:711
+msgid "Filed under:"
+msgstr "Archivado bajo:"
 
-#: ../../include/widgets.php:183
-msgid "Examples: bob@example.com, https://example.com/barbara"
-msgstr "Ejemplos: manuel@ejemplo.com, https://ejemplo.com/carmen"
+#: ../../include/conversation.php:738
+msgid "View in context"
+msgstr "Mostrar en su contexto"
 
-#: ../../include/widgets.php:199
-msgid "Notes"
-msgstr "Notas"
+#: ../../include/conversation.php:850
+msgid "remove"
+msgstr "eliminar"
 
-#: ../../include/widgets.php:273
-msgid "Remove term"
-msgstr "Eliminar término"
+#: ../../include/conversation.php:855
+msgid "Delete Selected Items"
+msgstr "Eliminar elementos seleccionados"
 
-#: ../../include/widgets.php:354
-msgid "Archives"
-msgstr "Hemeroteca"
+#: ../../include/conversation.php:953
+msgid "View Source"
+msgstr "Ver la fuente original de la publicación"
 
-#: ../../include/widgets.php:467
-msgid "Refresh"
-msgstr "Recargar"
+#: ../../include/conversation.php:954
+msgid "Follow Thread"
+msgstr "Seguir este hilo"
 
-#: ../../include/widgets.php:507
-msgid "Account settings"
-msgstr "Configuración de la cuenta"
+#: ../../include/conversation.php:955
+msgid "Unfollow Thread"
+msgstr "Dejar de seguir este hilo"
 
-#: ../../include/widgets.php:513
-msgid "Channel settings"
-msgstr "Configuración del canal"
+#: ../../include/conversation.php:960
+msgid "Activity/Posts"
+msgstr "Actividad y publicaciones"
 
-#: ../../include/widgets.php:522
-msgid "Additional features"
-msgstr "Funcionalidades"
+#: ../../include/conversation.php:962
+msgid "Edit Connection"
+msgstr "Editar conexión"
 
-#: ../../include/widgets.php:529
-msgid "Feature/Addon settings"
-msgstr "Complementos"
+#: ../../include/conversation.php:963
+msgid "Message"
+msgstr "Mensaje"
 
-#: ../../include/widgets.php:535
-msgid "Display settings"
-msgstr "Ajustes de visualización"
+#: ../../include/conversation.php:1080
+#, php-format
+msgid "%s likes this."
+msgstr "A %s le gusta esto."
 
-#: ../../include/widgets.php:542
-msgid "Manage locations"
-msgstr "Gestión de ubicaciones (clones) del canal"
+#: ../../include/conversation.php:1080
+#, php-format
+msgid "%s doesn't like this."
+msgstr "A %s no le gusta esto."
 
-#: ../../include/widgets.php:551
-msgid "Export channel"
-msgstr "Exportar canal"
+#: ../../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/widgets.php:558
-msgid "Connected apps"
-msgstr "Aplicaciones conectadas"
+#: ../../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/widgets.php:573
-msgid "Premium Channel Settings"
-msgstr "Configuración del canal premium"
+#: ../../include/conversation.php:1092
+msgid "and"
+msgstr "y"
 
-#: ../../include/widgets.php:602
-msgid "Private Mail Menu"
-msgstr "Menú de correo privado"
+#: ../../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/widgets.php:604
-msgid "Combined View"
-msgstr "Vista combinada"
+#: ../../include/conversation.php:1096
+#, php-format
+msgid "%s like this."
+msgstr "A %s le gusta esto."
 
-#: ../../include/widgets.php:609 ../../include/nav.php:196
-msgid "Inbox"
-msgstr "Bandeja de entrada"
+#: ../../include/conversation.php:1096
+#, php-format
+msgid "%s don't like this."
+msgstr "A %s no le gusta esto."
 
-#: ../../include/widgets.php:614 ../../include/nav.php:197
-msgid "Outbox"
-msgstr "Bandeja de salida"
+#: ../../include/conversation.php:1136
+msgid "Set your location"
+msgstr "Establecer su ubicación"
 
-#: ../../include/widgets.php:619 ../../include/nav.php:198
-msgid "New Message"
-msgstr "Nuevo mensaje"
+#: ../../include/conversation.php:1137
+msgid "Clear browser location"
+msgstr "Eliminar los datos de localización geográfica del navegador"
 
-#: ../../include/widgets.php:636 ../../include/widgets.php:648
-msgid "Conversations"
-msgstr "Conversaciones"
+#: ../../include/conversation.php:1183
+msgid "Tag term:"
+msgstr "Término de la etiqueta:"
 
-#: ../../include/widgets.php:640
-msgid "Received Messages"
-msgstr "Mensajes recibidos"
+#: ../../include/conversation.php:1184
+msgid "Where are you right now?"
+msgstr "¿Donde está ahora?"
 
-#: ../../include/widgets.php:644
-msgid "Sent Messages"
-msgstr "Enviar mensajes"
+#: ../../include/conversation.php:1216
+msgid "Page link name"
+msgstr "Nombre del enlace de la página"
 
-#: ../../include/widgets.php:658
-msgid "No messages."
-msgstr "Sin mensajes."
+#: ../../include/conversation.php:1219
+msgid "Post as"
+msgstr "Publicar como"
 
-#: ../../include/widgets.php:676
-msgid "Delete conversation"
-msgstr "Eliminar conversación"
+#: ../../include/conversation.php:1229
+msgid "Toggle voting"
+msgstr "Cambiar votación"
 
-#: ../../include/widgets.php:702
-msgid "Events Menu"
-msgstr "Menú de eventos"
+#: ../../include/conversation.php:1237
+msgid "Categories (optional, comma-separated list)"
+msgstr "Categorías (opcional, lista separada por comas)"
 
-#: ../../include/widgets.php:703
-msgid "Day View"
-msgstr "Eventos del día"
+#: ../../include/conversation.php:1260
+msgid "Set publish date"
+msgstr "Establecer la fecha de publicación"
 
-#: ../../include/widgets.php:704
-msgid "Week View"
-msgstr "Eventos de la semana"
+#: ../../include/conversation.php:1264
+msgid "OK"
+msgstr "OK"
 
-#: ../../include/widgets.php:705
-msgid "Month View"
-msgstr "Eventos del mes"
+#: ../../include/conversation.php:1509
+msgid "Discover"
+msgstr "Descubrir"
 
-#: ../../include/widgets.php:717
-msgid "Events Tools"
-msgstr "Gestión de eventos"
+#: ../../include/conversation.php:1512
+msgid "Imported public streams"
+msgstr "Contenidos públicos importados"
 
-#: ../../include/widgets.php:718
-msgid "Export Calendar"
-msgstr "Exportar el calendario"
+#: ../../include/conversation.php:1517
+msgid "Commented Order"
+msgstr "Comentarios recientes"
 
-#: ../../include/widgets.php:719
-msgid "Import Calendar"
-msgstr "Importar un calendario"
+#: ../../include/conversation.php:1520
+msgid "Sort by Comment Date"
+msgstr "Ordenar por fecha de comentario"
 
-#: ../../include/widgets.php:798
-msgid "Overview"
-msgstr "Resumen"
+#: ../../include/conversation.php:1524
+msgid "Posted Order"
+msgstr "Publicaciones recientes"
 
-#: ../../include/widgets.php:805
-msgid "Chat Members"
-msgstr "Miembros del chat"
+#: ../../include/conversation.php:1527
+msgid "Sort by Post Date"
+msgstr "Ordenar por fecha de publicación"
 
-#: ../../include/widgets.php:828
-msgid "Bookmarked Chatrooms"
-msgstr "Salas de chat preferidas"
+#: ../../include/conversation.php:1535
+msgid "Posts that mention or involve you"
+msgstr "Publicaciones que le mencionan o involucran"
 
-#: ../../include/widgets.php:851
-msgid "Suggested Chatrooms"
-msgstr "Salas de chat sugeridas"
+#: ../../include/conversation.php:1544
+msgid "Activity Stream - by date"
+msgstr "Contenido - por fecha"
 
-#: ../../include/widgets.php:996 ../../include/widgets.php:1108
-msgid "photo/image"
-msgstr "foto/imagen"
+#: ../../include/conversation.php:1550
+msgid "Starred"
+msgstr "Preferidas"
 
-#: ../../include/widgets.php:1051
-msgid "Click to show more"
-msgstr "Hacer clic para ver más"
+#: ../../include/conversation.php:1553
+msgid "Favourite Posts"
+msgstr "Publicaciones favoritas"
 
-#: ../../include/widgets.php:1202
-msgid "Rating Tools"
-msgstr "Valoraciones"
+#: ../../include/conversation.php:1560
+msgid "Spam"
+msgstr "Correo basura"
 
-#: ../../include/widgets.php:1206 ../../include/widgets.php:1208
-msgid "Rate Me"
-msgstr "Valorar este canal"
+#: ../../include/conversation.php:1563
+msgid "Posts flagged as SPAM"
+msgstr "Publicaciones marcadas como basura"
 
-#: ../../include/widgets.php:1211
-msgid "View Ratings"
-msgstr "Mostrar las valoraciones"
+#: ../../include/conversation.php:1620
+msgid "Status Messages and Posts"
+msgstr "Mensajes de estado y publicaciones"
 
-#: ../../include/widgets.php:1268
-msgid "Forums"
-msgstr "Foros"
+#: ../../include/conversation.php:1629
+msgid "About"
+msgstr "Mi perfil"
 
-#: ../../include/widgets.php:1297
-msgid "Tasks"
-msgstr "Tareas"
+#: ../../include/conversation.php:1632
+msgid "Profile Details"
+msgstr "Detalles del perfil"
 
-#: ../../include/widgets.php:1306
-msgid "Documentation"
-msgstr "Documentación"
+#: ../../include/conversation.php:1648
+msgid "Files and Storage"
+msgstr "Ficheros y repositorio"
 
-#: ../../include/widgets.php:1308
-msgid "Project/Site Information"
-msgstr "Información sobre el proyecto o sitio"
+#: ../../include/conversation.php:1685
+msgid "Saved Bookmarks"
+msgstr "Marcadores guardados"
 
-#: ../../include/widgets.php:1309
-msgid "For Members"
-msgstr "Para los miembros"
+#: ../../include/conversation.php:1695
+msgid "Manage Webpages"
+msgstr "Administrar páginas web"
 
-#: ../../include/widgets.php:1310
-msgid "For Administrators"
-msgstr "Para los administradores"
+#: ../../include/conversation.php:1754
+msgctxt "noun"
+msgid "Attending"
+msgid_plural "Attending"
+msgstr[0] "Participaré"
+msgstr[1] "Participaré"
 
-#: ../../include/widgets.php:1311
-msgid "For Developers"
-msgstr "Para los desarrolladores"
+#: ../../include/conversation.php:1757
+msgctxt "noun"
+msgid "Not Attending"
+msgid_plural "Not Attending"
+msgstr[0] "No participaré"
+msgstr[1] "No participaré"
 
-#: ../../include/widgets.php:1335
-msgid "Accounts"
-msgstr "Cuentas"
+#: ../../include/conversation.php:1760
+msgctxt "noun"
+msgid "Undecided"
+msgid_plural "Undecided"
+msgstr[0] "Indeciso/a"
+msgstr[1] "Indecisos/as"
 
-#: ../../include/widgets.php:1335 ../../include/widgets.php:1373
-msgid "Member registrations waiting for confirmation"
-msgstr "Inscripciones de nuevos miembros pendientes de aprobación"
+#: ../../include/conversation.php:1763
+msgctxt "noun"
+msgid "Agree"
+msgid_plural "Agrees"
+msgstr[0] "De acuerdo"
+msgstr[1] "De acuerdo"
 
-#: ../../include/widgets.php:1341
-msgid "Inspect queue"
-msgstr "Examinar la cola"
+#: ../../include/conversation.php:1766
+msgctxt "noun"
+msgid "Disagree"
+msgid_plural "Disagrees"
+msgstr[0] "En desacuerdo"
+msgstr[1] "En desacuerdo"
 
-#: ../../include/widgets.php:1343
-msgid "DB updates"
-msgstr "Actualizaciones de la base de datos"
+#: ../../include/conversation.php:1769
+msgctxt "noun"
+msgid "Abstain"
+msgid_plural "Abstains"
+msgstr[0] "se abstiene"
+msgstr[1] "Se abstienen"
 
-#: ../../include/widgets.php:1368 ../../include/nav.php:216
-msgid "Admin"
-msgstr "Administrador"
+#: ../../include/text.php:423
+msgid "prev"
+msgstr "anterior"
 
-#: ../../include/widgets.php:1369
-msgid "Plugin Features"
-msgstr "Extensiones"
+#: ../../include/text.php:425
+msgid "first"
+msgstr "primera"
 
-#: ../../include/taxonomy.php:240 ../../include/taxonomy.php:261
+#: ../../include/text.php:454
+msgid "last"
+msgstr "última"
+
+#: ../../include/text.php:457
+msgid "next"
+msgstr "próxima"
+
+#: ../../include/text.php:467
+msgid "older"
+msgstr "más antiguas"
+
+#: ../../include/text.php:469
+msgid "newer"
+msgstr "más recientes"
+
+#: ../../include/text.php:851
+msgid "No connections"
+msgstr "Sin conexiones"
+
+#: ../../include/text.php:876
+#, php-format
+msgid "View all %s connections"
+msgstr "Ver todas las %s conexiones"
+
+#: ../../include/text.php:1021 ../../include/text.php:1026
+msgid "poke"
+msgstr "un toque"
+
+#: ../../include/text.php:1027
+msgid "ping"
+msgstr "un \"ping\""
+
+#: ../../include/text.php:1027
+msgid "pinged"
+msgstr "ha enviado un \"ping\" a"
+
+#: ../../include/text.php:1028
+msgid "prod"
+msgstr "una incitación "
+
+#: ../../include/text.php:1028
+msgid "prodded"
+msgstr "ha incitado a "
+
+#: ../../include/text.php:1029
+msgid "slap"
+msgstr "una bofetada "
+
+#: ../../include/text.php:1029
+msgid "slapped"
+msgstr "ha abofeteado a "
+
+#: ../../include/text.php:1030
+msgid "finger"
+msgstr "un \"finger\" "
+
+#: ../../include/text.php:1030
+msgid "fingered"
+msgstr "envió un \"finger\" a"
+
+#: ../../include/text.php:1031
+msgid "rebuff"
+msgstr "un reproche"
+
+#: ../../include/text.php:1031
+msgid "rebuffed"
+msgstr "ha hecho un reproche a "
+
+#: ../../include/text.php:1043
+msgid "happy"
+msgstr "feliz "
+
+#: ../../include/text.php:1044
+msgid "sad"
+msgstr "triste "
+
+#: ../../include/text.php:1045
+msgid "mellow"
+msgstr "tranquilo/a"
+
+#: ../../include/text.php:1046
+msgid "tired"
+msgstr "cansado/a "
+
+#: ../../include/text.php:1047
+msgid "perky"
+msgstr "vivaz"
+
+#: ../../include/text.php:1048
+msgid "angry"
+msgstr "enfadado/a"
+
+#: ../../include/text.php:1049
+msgid "stupefied"
+msgstr "asombrado/a"
+
+#: ../../include/text.php:1050
+msgid "puzzled"
+msgstr "perplejo/a"
+
+#: ../../include/text.php:1051
+msgid "interested"
+msgstr "interesado/a"
+
+#: ../../include/text.php:1052
+msgid "bitter"
+msgstr "amargado/a"
+
+#: ../../include/text.php:1053
+msgid "cheerful"
+msgstr "alegre"
+
+#: ../../include/text.php:1054
+msgid "alive"
+msgstr "animado/a"
+
+#: ../../include/text.php:1055
+msgid "annoyed"
+msgstr "molesto/a"
+
+#: ../../include/text.php:1056
+msgid "anxious"
+msgstr "ansioso/a"
+
+#: ../../include/text.php:1057
+msgid "cranky"
+msgstr "de mal humor"
+
+#: ../../include/text.php:1058
+msgid "disturbed"
+msgstr "perturbado/a"
+
+#: ../../include/text.php:1059
+msgid "frustrated"
+msgstr "frustrado/a"
+
+#: ../../include/text.php:1060
+msgid "depressed"
+msgstr "deprimido/a"
+
+#: ../../include/text.php:1061
+msgid "motivated"
+msgstr "motivado/a"
+
+#: ../../include/text.php:1062
+msgid "relaxed"
+msgstr "relajado/a"
+
+#: ../../include/text.php:1063
+msgid "surprised"
+msgstr "sorprendido/a"
+
+#: ../../include/text.php:1235 ../../include/js_strings.php:70
+msgid "Monday"
+msgstr "lunes"
+
+#: ../../include/text.php:1235 ../../include/js_strings.php:71
+msgid "Tuesday"
+msgstr "martes"
+
+#: ../../include/text.php:1235 ../../include/js_strings.php:72
+msgid "Wednesday"
+msgstr "miércoles"
+
+#: ../../include/text.php:1235 ../../include/js_strings.php:73
+msgid "Thursday"
+msgstr "jueves"
+
+#: ../../include/text.php:1235 ../../include/js_strings.php:74
+msgid "Friday"
+msgstr "viernes"
+
+#: ../../include/text.php:1235 ../../include/js_strings.php:75
+msgid "Saturday"
+msgstr "sábado"
+
+#: ../../include/text.php:1235 ../../include/js_strings.php:69
+msgid "Sunday"
+msgstr "domingo"
+
+#: ../../include/text.php:1239 ../../include/js_strings.php:45
+msgid "January"
+msgstr "enero"
+
+#: ../../include/text.php:1239 ../../include/js_strings.php:46
+msgid "February"
+msgstr "febrero"
+
+#: ../../include/text.php:1239 ../../include/js_strings.php:47
+msgid "March"
+msgstr "marzo"
+
+#: ../../include/text.php:1239 ../../include/js_strings.php:48
+msgid "April"
+msgstr "abril"
+
+#: ../../include/text.php:1239
+msgid "May"
+msgstr "mayo"
+
+#: ../../include/text.php:1239 ../../include/js_strings.php:50
+msgid "June"
+msgstr "junio"
+
+#: ../../include/text.php:1239 ../../include/js_strings.php:51
+msgid "July"
+msgstr "julio"
+
+#: ../../include/text.php:1239 ../../include/js_strings.php:52
+msgid "August"
+msgstr "agosto"
+
+#: ../../include/text.php:1239 ../../include/js_strings.php:53
+msgid "September"
+msgstr "septiembre"
+
+#: ../../include/text.php:1239 ../../include/js_strings.php:54
+msgid "October"
+msgstr "octubre"
+
+#: ../../include/text.php:1239 ../../include/js_strings.php:55
+msgid "November"
+msgstr "noviembre"
+
+#: ../../include/text.php:1239 ../../include/js_strings.php:56
+msgid "December"
+msgstr "diciembre"
+
+#: ../../include/text.php:1316 ../../include/text.php:1320
+msgid "Unknown Attachment"
+msgstr "Adjunto no reconocido"
+
+#: ../../include/text.php:1322
+msgid "unknown"
+msgstr "desconocido"
+
+#: ../../include/text.php:1358
+msgid "remove category"
+msgstr "eliminar categoría"
+
+#: ../../include/text.php:1435
+msgid "remove from file"
+msgstr "eliminar del fichero"
+
+#: ../../include/text.php:1764 ../../include/text.php:1836
+msgid "default"
+msgstr "por defecto"
+
+#: ../../include/text.php:1772
+msgid "Page layout"
+msgstr "Plantilla de la página"
+
+#: ../../include/text.php:1772
+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
+msgid "Page content type"
+msgstr "Tipo de contenido de la página"
+
+#: ../../include/text.php:1848
+msgid "Select an alternate language"
+msgstr "Seleccionar un idioma alternativo"
+
+#: ../../include/text.php:1965
+msgid "activity"
+msgstr "la actividad"
+
+#: ../../include/text.php:2274
+msgid "Design Tools"
+msgstr "Herramientas de diseño web"
+
+#: ../../include/text.php:2280
+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/account.php:414
+msgid "Account approved."
+msgstr "Cuenta aprobada."
+
+#: ../../include/account.php:454
+#, 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 "
+
+#: ../../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/taxonomy.php:228 ../../include/taxonomy.php:249
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: ../../include/taxonomy.php:305
+#: ../../include/taxonomy.php:293
 msgid "Keywords"
 msgstr "Palabras clave"
 
-#: ../../include/taxonomy.php:326
+#: ../../include/taxonomy.php:314
 msgid "have"
 msgstr "tener"
 
-#: ../../include/taxonomy.php:326
+#: ../../include/taxonomy.php:314
 msgid "has"
 msgstr "tiene"
 
-#: ../../include/taxonomy.php:327
+#: ../../include/taxonomy.php:315
 msgid "want"
 msgstr "quiero"
 
-#: ../../include/taxonomy.php:327
+#: ../../include/taxonomy.php:315
 msgid "wants"
 msgstr "quiere"
 
-#: ../../include/taxonomy.php:328
+#: ../../include/taxonomy.php:316
 msgid "likes"
 msgstr "gusta de"
 
-#: ../../include/taxonomy.php:329
+#: ../../include/taxonomy.php:317
 msgid "dislikes"
 msgstr "no gusta de"
 
+#: ../../include/PermissionDescription.php:115
+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:124
+msgid "Only me (only specified contacts and me)"
+msgstr "Sólo yo (sólo los contactos especificados y yo)"
+
+#: ../../include/PermissionDescription.php:125
+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:126
+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:169
+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:170
+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:171
+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:172
+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:173
+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?"
@@ -9045,6 +9211,10 @@ msgstr "Contraseña demasiado corta"
 msgid "Passwords do not match"
 msgstr "Las contraseñas no coinciden"
 
+#: ../../include/js_strings.php:13
+msgid "everybody"
+msgstr "cualquiera"
+
 #: ../../include/js_strings.php:14
 msgid "Secret Passphrase"
 msgstr "Contraseña secreta"
@@ -9277,174 +9447,9 @@ msgstr "No ha sido posible determinar el remitente. "
 msgid "Stored post could not be verified."
 msgstr "No se han podido verificar las publicaciones guardadas."
 
-#: ../../include/nav.php:82 ../../include/nav.php:113 ../../boot.php:1614
-msgid "Logout"
-msgstr "Finalizar sesión"
-
-#: ../../include/nav.php:82 ../../include/nav.php:113
-msgid "End this session"
-msgstr "Finalizar esta sesión"
-
-#: ../../include/nav.php:85 ../../include/nav.php:144
-msgid "Home"
-msgstr "Inicio"
-
-#: ../../include/nav.php:85
-msgid "Your posts and conversations"
-msgstr "Sus publicaciones y conversaciones"
-
-#: ../../include/nav.php:86
-msgid "Your profile page"
-msgstr "Su página del perfil"
-
-#: ../../include/nav.php:88
-msgid "Manage/Edit profiles"
-msgstr "Administrar/editar perfiles"
-
-#: ../../include/nav.php:90
-msgid "Edit your profile"
-msgstr "Editar su perfil"
-
-#: ../../include/nav.php:92
-msgid "Your photos"
-msgstr "Sus fotos"
-
-#: ../../include/nav.php:93
-msgid "Your files"
-msgstr "Sus ficheros"
-
-#: ../../include/nav.php:96
-msgid "Your chatrooms"
-msgstr "Sus salas de chat"
-
-#: ../../include/nav.php:102
-msgid "Your bookmarks"
-msgstr "Sus marcadores"
-
-#: ../../include/nav.php:106
-msgid "Your webpages"
-msgstr "Sus páginas web"
-
-#: ../../include/nav.php:110
-msgid "Sign in"
-msgstr "Acceder"
-
-#: ../../include/nav.php:127
-#, php-format
-msgid "%s - click to logout"
-msgstr "%s - pulsar para finalizar sesión"
-
-#: ../../include/nav.php:130
-msgid "Remote authentication"
-msgstr "Acceder desde su servidor"
-
-#: ../../include/nav.php:130
-msgid "Click to authenticate to your home hub"
-msgstr "Pulsar para identificarse en su servidor de inicio"
-
-#: ../../include/nav.php:144
-msgid "Home Page"
-msgstr "Página de inicio"
-
-#: ../../include/nav.php:147
-msgid "Create an account"
-msgstr "Crear una cuenta"
-
-#: ../../include/nav.php:159
-msgid "Help and documentation"
-msgstr "Ayuda y documentación"
-
-#: ../../include/nav.php:163
-msgid "Applications, utilities, links, games"
-msgstr "Aplicaciones, utilidades, enlaces, juegos"
-
-#: ../../include/nav.php:165
-msgid "Search site @name, #tag, ?docs, content"
-msgstr "Buscar en el sitio por @nombre, #etiqueta, ?ayuda o contenido"
-
-#: ../../include/nav.php:167
-msgid "Channel Directory"
-msgstr "Directorio de canales"
-
-#: ../../include/nav.php:179
-msgid "Your grid"
-msgstr "Mi red"
-
-#: ../../include/nav.php:180
-msgid "Mark all grid notifications seen"
-msgstr "Marcar todas las notificaciones de la red como vistas"
-
-#: ../../include/nav.php:182
-msgid "Channel home"
-msgstr "Mi canal"
-
-#: ../../include/nav.php:183
-msgid "Mark all channel notifications seen"
-msgstr "Marcar todas las notificaciones del canal como leídas"
-
-#: ../../include/nav.php:189
-msgid "Notices"
-msgstr "Avisos"
-
-#: ../../include/nav.php:189
-msgid "Notifications"
-msgstr "Notificaciones"
-
-#: ../../include/nav.php:190
-msgid "See all notifications"
-msgstr "Ver todas las notificaciones"
-
-#: ../../include/nav.php:193
-msgid "Private mail"
-msgstr "Correo privado"
-
-#: ../../include/nav.php:194
-msgid "See all private messages"
-msgstr "Ver todas los mensajes privados"
-
-#: ../../include/nav.php:195
-msgid "Mark all private messages seen"
-msgstr "Marcar todos los mensajes privados como leídos"
-
-#: ../../include/nav.php:201
-msgid "Event Calendar"
-msgstr "Calendario de eventos"
-
-#: ../../include/nav.php:202
-msgid "See all events"
-msgstr "Ver todos los eventos"
-
-#: ../../include/nav.php:203
-msgid "Mark all events seen"
-msgstr "Marcar todos los eventos como leidos"
-
-#: ../../include/nav.php:206
-msgid "Manage Your Channels"
-msgstr "Gestionar sus canales"
-
-#: ../../include/nav.php:208
-msgid "Account/Channel Settings"
-msgstr "Ajustes de cuenta/canales"
-
-#: ../../include/nav.php:216
-msgid "Site Setup and Configuration"
-msgstr "Ajustes y configuración del sitio"
-
-#: ../../include/nav.php:252
-msgid "@name, #tag, ?doc, content"
-msgstr "@nombre, #etiqueta, ?ayuda, contenido"
-
-#: ../../include/nav.php:253
-msgid "Please wait..."
-msgstr "Espere por favor…"
-
-#: ../../include/oembed.php:267
-msgid "Embedded content"
-msgstr "Contenido incorporado"
-
-#: ../../include/oembed.php:276
-msgid "Embedding disabled"
-msgstr "Incrustación deshabilitada"
+#: ../../include/api.php:1338
+msgid "Public Timeline"
+msgstr "Cronología pública"
 
 #: ../../include/page_widgets.php:6
 msgid "New Page"
@@ -9595,32 +9600,61 @@ msgstr "Especial - Repositorio de grupo"
 msgid "Custom/Expert Mode"
 msgstr "Modo personalizado/experto"
 
-#: ../../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/apps.php:155
+msgid "Site Admin"
+msgstr "Administrador del sitio"
 
-#: ../../include/photos.php:119
-msgid "Image file is empty."
-msgstr "El fichero de imagen está vacío. "
+#: ../../include/apps.php:156
+msgid "Bug Report"
+msgstr "Informe de errores"
 
-#: ../../include/photos.php:257
-msgid "Photo storage failed."
-msgstr "La foto no ha podido ser guardada."
+#: ../../include/apps.php:157
+msgid "View Bookmarks"
+msgstr "Ver los marcadores"
 
-#: ../../include/photos.php:297
-msgid "a new photo"
-msgstr "una nueva foto"
+#: ../../include/apps.php:158
+msgid "My Chatrooms"
+msgstr "Mis salas de chat"
 
-#: ../../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/apps.php:160
+msgid "Firefox Share"
+msgstr "Servicio de compartición de Firefox"
 
-#: ../../include/photos.php:510
-msgid "Upload New Photos"
-msgstr "Subir nuevas fotos"
+#: ../../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
+msgid "$Projectname event notification:"
+msgstr "Notificación de eventos de $Projectname:"
 
 #: ../../view/theme/redbasic/php/config.php:82
 msgid "Focus (Hubzilla default)"
@@ -9796,24 +9830,24 @@ msgstr "Recordarme"
 msgid "Forgot your password?"
 msgstr "¿Olvidó su contraseña?"
 
-#: ../../boot.php:2251
+#: ../../boot.php:2269
 msgid "toggle mobile"
 msgstr "cambiar a modo móvil"
 
-#: ../../boot.php:2404
+#: ../../boot.php:2422
 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:2407
+#: ../../boot.php:2425
 #, php-format
 msgid "[hubzilla] Website SSL error for %s"
 msgstr "[hubzilla] Error SSL del sitio web en %s"
 
-#: ../../boot.php:2444
+#: ../../boot.php:2462
 msgid "Cron/Scheduled tasks not running."
 msgstr "Las tareas del Planificador/Cron no están funcionando."
 
-#: ../../boot.php:2448
+#: ../../boot.php:2466
 #, 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 b995ee27b..cbb8f6e57 100644
--- a/view/es-es/hstrings.php
+++ b/view/es-es/hstrings.php
@@ -48,13 +48,16 @@ App::$strings["# Channels"] = "# Canales";
 App::$strings["# primary"] = "# primario";
 App::$strings["# clones"] = "# clones";
 App::$strings["Message queues"] = "Mensajes en cola";
+App::$strings["Your software should be updated"] = "Debe actualizar su software";
 App::$strings["Administration"] = "Administración";
 App::$strings["Summary"] = "Sumario";
 App::$strings["Registered accounts"] = "Cuentas registradas";
 App::$strings["Pending registrations"] = "Registros pendientes";
 App::$strings["Registered channels"] = "Canales registrados";
-App::$strings["Active plugins"] = "Extensiones activas";
+App::$strings["Active plugins"] = "Extensiones (plugins) activas";
 App::$strings["Version"] = "Versión";
+App::$strings["Repository version (master)"] = "Versión del repositorio (master)";
+App::$strings["Repository version (dev)"] = "Versión del repositorio (dev)";
 App::$strings["Site settings updated."] = "Ajustes del sitio actualizados.";
 App::$strings["Default"] = "Predeterminado";
 App::$strings["mobile"] = "móvil";
@@ -140,17 +143,24 @@ 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["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.";
 App::$strings["Security"] = "Seguridad";
 App::$strings["Block public"] = "Bloquear páginas públicas";
 App::$strings["Check to block public access to all otherwise public personal pages on this site unless you are currently authenticated."] = "Habilitar para impedir ver las páginas personales de este sitio a quien no esté actualmente autenticado.";
+App::$strings["Set \"Transport Security\" HTTP header"] = "Habilitar \"Seguridad de transporte\" (\"Transport Security\") en la cabecera HTTP";
+App::$strings["Set \"Content Security Policy\" HTTP header"] = "Habilitar la \"Política de seguridad del contenido\" (\"Content Security Policy\") en la cabecera HTTP";
 App::$strings["Allow communications only from these sites"] = "Permitir la comunicación solo desde estos sitios";
 App::$strings["One site per line. Leave empty to allow communication from anywhere by default"] = "Un sitio por línea. Dejar en blanco para permitir por defecto la comunicación desde cualquiera";
 App::$strings["Block communications from these sites"] = "Bloquear la comunicación desde estos sitios";
 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["Allow embedded HTML content only from these domains"] = "Permitir contenido con HTML incorporado solo desde estos dominios";
-App::$strings["One site per line. Leave empty to allow from any site by default"] = "Un sitio por línea. Dejar en blanco para permitirlo por defecto desde cualquier sitio";
+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["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";
 App::$strings["Update has been marked successful"] = "La actualización ha sido marcada como exitosa";
 App::$strings["Executing %s failed. Check system logs."] = "La ejecución de %s ha fallado. Mirar en los informes del sistema.";
@@ -229,7 +239,7 @@ App::$strings["Plugin %s disabled."] = "Extensión %s desactivada.";
 App::$strings["Plugin %s enabled."] = "Extensión %s activada.";
 App::$strings["Disable"] = "Desactivar";
 App::$strings["Enable"] = "Activar";
-App::$strings["Plugins"] = "Extensiones";
+App::$strings["Plugins"] = "Extensiones (plugins)";
 App::$strings["Toggle"] = "Cambiar";
 App::$strings["Settings"] = "Ajustes";
 App::$strings["Author: "] = "Autor:";
@@ -239,6 +249,18 @@ App::$strings["Maximum project version: "] = "Versión máxima del proyecto:";
 App::$strings["Minimum PHP version: "] = "Versión mínima de PHP:";
 App::$strings["Requires: "] = "Se requiere:";
 App::$strings["Disabled - version incompatibility"] = "Deshabilitado - versiones incompatibles";
+App::$strings["Enter the public git repository URL of the plugin repo."] = "Escriba la URL pública del repositorio git del plugin.";
+App::$strings["Plugin repo git URL"] = "URL del repositorio git del plugin";
+App::$strings["Custom repo name"] = "Nombre personalizado del repositorio";
+App::$strings["(optional)"] = "(opcional)";
+App::$strings["Download Plugin Repo"] = "Descargar el repositorio";
+App::$strings["Install new repo"] = "Instalar un nuevo repositorio";
+App::$strings["Install"] = "Instalar";
+App::$strings["Cancel"] = "Cancelar";
+App::$strings["Add Plugin Repo"] = "Añadir un repositorio";
+App::$strings["Update"] = "Actualizar";
+App::$strings["Switch branch"] = "Cambiar la rama";
+App::$strings["Remove"] = "Eliminar";
 App::$strings["No themes found."] = "No se han encontrado temas.";
 App::$strings["Screenshot"] = "Instantánea de pantalla";
 App::$strings["Themes"] = "Temas";
@@ -284,10 +306,11 @@ App::$strings["Location (URL) of app"] = "Dirección (URL) de la aplicación";
 App::$strings["Description"] = "Descripción";
 App::$strings["Photo icon URL"] = "Dirección del icono";
 App::$strings["80 x 80 pixels - optional"] = "80 x 80 pixels - opcional";
+App::$strings["Categories (optional, comma separated list)"] = "Categorías (opcional, lista separada por comas)";
 App::$strings["Version ID"] = "Versión";
 App::$strings["Price of app"] = "Precio de la aplicación";
 App::$strings["Location (URL) to purchase app"] = "Dirección (URL) donde adquirir la aplicación";
-App::$strings["Apps"] = "Aplicaciones";
+App::$strings["Apps"] = "Aplicaciones (apps)";
 App::$strings["Item not available."] = "Elemento no disponible";
 App::$strings["Invalid item."] = "Elemento no válido.";
 App::$strings["Channel not found."] = "Canal no encontrado.";
@@ -301,7 +324,6 @@ App::$strings["View"] = "Ver";
 App::$strings["Bookmark added"] = "Marcador añadido";
 App::$strings["My Bookmarks"] = "Mis marcadores";
 App::$strings["My Connections Bookmarks"] = "Marcadores de mis conexiones";
-App::$strings["everybody"] = "cualquiera";
 App::$strings["Permissions denied."] = "Permisos denegados.";
 App::$strings["l, F j"] = "l j F";
 App::$strings["Link to Source"] = "Enlazar con la entrada en su ubicación original";
@@ -316,7 +338,6 @@ App::$strings["You must be logged in to see this page."] = "Debe haber iniciado
 App::$strings["Posts and comments"] = "Publicaciones y comentarios";
 App::$strings["Only posts"] = "Solo publicaciones";
 App::$strings["Insufficient permissions.  Request redirected to profile page."] = "Permisos insuficientes. Petición redirigida a la página del perfil.";
-App::$strings["Public"] = "Público";
 App::$strings["Room not found"] = "Sala no encontrada";
 App::$strings["Leave Room"] = "Abandonar la sala";
 App::$strings["Delete Room"] = "Eliminar esta sala";
@@ -467,7 +488,6 @@ App::$strings["select a photo from your photo albums"] = "Seleccione una foto de
 App::$strings["Crop Image"] = "Recortar imagen";
 App::$strings["Please adjust the image cropping for optimum viewing."] = "Por favor ajuste el recorte de la imagen para una visión óptima.";
 App::$strings["Done Editing"] = "Edición completada";
-App::$strings["\$Projectname channel"] = "Canal \$Projectname";
 App::$strings["Public access denied."] = "Acceso público denegado.";
 App::$strings["%d rating"] = array(
 	0 => "%d valoración",
@@ -516,41 +536,14 @@ App::$strings["mail recalled"] = "mensaje de correo revocado";
 App::$strings["duplicate mail received"] = "se ha recibido mensaje duplicado";
 App::$strings["mail delivered"] = "correo enviado";
 App::$strings["Item not found"] = "Elemento no encontrado";
-App::$strings["Delete block?"] = "¿Borrar bloque?";
-App::$strings["Bold"] = "Negrita";
-App::$strings["Italic"] = "Itálico ";
-App::$strings["Underline"] = "Subrayar";
-App::$strings["Quote"] = "Citar";
-App::$strings["Code"] = "Código";
-App::$strings["Attach file"] = "Adjuntar fichero";
-App::$strings["Permission settings"] = "Configuración de permisos";
-App::$strings["Public post"] = "Entrada pública";
 App::$strings["Title (optional)"] = "Título (opcional)";
-App::$strings["Categories (optional, comma-separated list)"] = "Categorías (opcional, lista separada por comas)";
-App::$strings["Example: bob@example.com, mary@example.com"] = "Ejemplo: roberto@ejemplo.com, maría@ejemplo.com";
-App::$strings["Preview"] = "Previsualizar";
 App::$strings["Edit Block"] = "Modificar este bloque";
-App::$strings["Delete layout?"] = "¿Borrar la plantilla?";
-App::$strings["Upload photo"] = "Subir foto";
-App::$strings["Insert YouTube video"] = "Insertar vídeo de YouTube";
-App::$strings["Insert Vorbis [.ogg] video"] = "Insertar vídeo Vorbis [.ogg]";
-App::$strings["Insert Vorbis [.ogg] audio"] = "Insertar audio Vorbis [.ogg]";
-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["Please wait"] = "Espere por favor";
-App::$strings["Layout Description (Optional)"] = "Descripción de la plantilla (opcional)";
 App::$strings["Layout Name"] = "Nombre de la plantilla";
-App::$strings["Set expiration date"] = "Configurar fecha de caducidad";
+App::$strings["Layout Description (Optional)"] = "Descripción de la plantilla (opcional)";
 App::$strings["Edit Layout"] = "Modificar la plantilla";
 App::$strings["Item is not editable"] = "El elemento no es editable";
-App::$strings["Expires YYYY-MM-DD HH:MM"] = "Caduca YYYY-MM-DD HH:MM";
-App::$strings["Delete item?"] = "¿Borrar elemento?";
-App::$strings["Toggle voting"] = "Cambiar votación";
-App::$strings["OK"] = "OK";
-App::$strings["Cancel"] = "Cancelar";
 App::$strings["Edit post"] = "Editar la entrada";
-App::$strings["Delete webpage?"] = "¿Eliminar la página web?";
-App::$strings["Page link title"] = "Título del enlace de la página";
+App::$strings["Page link"] = "Enlace de la página";
 App::$strings["Edit Webpage"] = "Editar la página web";
 App::$strings["Calendar entries imported."] = "Entradas de calendario importadas.";
 App::$strings["No calendar entries found."] = "No se han encontrado entradas de calendario.";
@@ -575,6 +568,8 @@ App::$strings["Edit Description"] = "Editar la descripción";
 App::$strings["Edit Location"] = "Modificar la dirección";
 App::$strings["Location"] = "Ubicación";
 App::$strings["Share this event"] = "Compartir este evento";
+App::$strings["Preview"] = "Previsualizar";
+App::$strings["Permission settings"] = "Configuración de permisos";
 App::$strings["Advanced Options"] = "Opciones avanzadas";
 App::$strings["Edit event"] = "Editar evento";
 App::$strings["Delete event"] = "Borrar evento";
@@ -760,11 +755,14 @@ App::$strings["Selected channel has private message restrictions. Send failed."]
 App::$strings["Messages"] = "Mensajes";
 App::$strings["Message recalled."] = "Mensaje revocado.";
 App::$strings["Conversation removed."] = "Conversación eliminada.";
+App::$strings["Expires YYYY-MM-DD HH:MM"] = "Caduca YYYY-MM-DD HH:MM";
 App::$strings["Requested channel is not in this network"] = "El canal solicitado no existe en esta red";
 App::$strings["Send Private Message"] = "Enviar un mensaje privado";
 App::$strings["To:"] = "Para:";
 App::$strings["Subject:"] = "Asunto:";
+App::$strings["Attach file"] = "Adjuntar fichero";
 App::$strings["Send"] = "Enviar";
+App::$strings["Set expiration date"] = "Configurar fecha de caducidad";
 App::$strings["Delete message"] = "Borrar mensaje";
 App::$strings["Delivery report"] = "Informe de transmisión";
 App::$strings["Recall message"] = "Revocar el mensaje";
@@ -906,7 +904,6 @@ App::$strings["Use as profile photo"] = "Usar como foto del perfil";
 App::$strings["Use as cover photo"] = "Usar como imagen de portada del perfil";
 App::$strings["Private Photo"] = "Foto privada";
 App::$strings["View Full Size"] = "Ver tamaño completo";
-App::$strings["Remove"] = "Eliminar";
 App::$strings["Edit photo"] = "Editar foto";
 App::$strings["Rotate CW (right)"] = "Girar CW (a la derecha)";
 App::$strings["Rotate CCW (left)"] = "Girar CCW (a la izquierda)";
@@ -918,6 +915,7 @@ App::$strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Ejemplos: @
 App::$strings["Flag as adult in album view"] = "Marcar como \"solo para adultos\" en el álbum";
 App::$strings["I like this (toggle)"] = "Me gusta (cambiar)";
 App::$strings["I don't like this (toggle)"] = "No me gusta esto (cambiar)";
+App::$strings["Please wait"] = "Espere por favor";
 App::$strings["This is you"] = "Este es usted";
 App::$strings["Comment"] = "Comentar";
 App::$strings["__ctx:title__ Likes"] = "Me gusta";
@@ -1099,7 +1097,6 @@ App::$strings["Search results for: %s"] = "Resultados de la búsqueda para: %s";
 App::$strings["No service class restrictions found."] = "No se han encontrado restricciones sobre esta clase de servicio.";
 App::$strings["Name is required"] = "El nombre es obligatorio";
 App::$strings["Key and Secret are required"] = "\"Key\" y \"Secret\" son obligatorios";
-App::$strings["Update"] = "Actualizar";
 App::$strings["Not valid email."] = "Correo electrónico no válido.";
 App::$strings["Protected email address. Cannot change to that email."] = "Dirección de correo electrónico protegida. No se puede cambiar a ella.";
 App::$strings["System failure storing new email. Please try again."] = "Fallo de sistema al guardar el nuevo correo electrónico. Por favor, inténtelo de nuevo.";
@@ -1119,7 +1116,7 @@ App::$strings["Redirect URI - leave blank unless your application specifically r
 App::$strings["Icon url"] = "Dirección del icono";
 App::$strings["Optional"] = "Opcional";
 App::$strings["Application not found."] = "Aplicación no encontrada.";
-App::$strings["Connected Apps"] = "Aplicaciones conectadas";
+App::$strings["Connected Apps"] = "Aplicaciones (apps) conectadas";
 App::$strings["Client key starts with"] = "La \"client key\" empieza por";
 App::$strings["No name"] = "Sin nombre";
 App::$strings["Remove authorization"] = "Eliminar autorización";
@@ -1195,6 +1192,7 @@ App::$strings["0 or blank to use the website limit. The website expires after %d
 App::$strings["Maximum Friend Requests/Day:"] = "Máximo de solicitudes de amistad por día:";
 App::$strings["May reduce spam activity"] = "Podría reducir la actividad de spam";
 App::$strings["Default Post Permissions"] = "Permisos de publicación predeterminados";
+App::$strings["Use my default audience setting for the type of post"] = "Usar los ajustes de mi audiencia predeterminada para el tipo de publicación";
 App::$strings["Channel permissions category:"] = "Categoría de permisos del canal:";
 App::$strings["Maximum private messages per day from unknown people:"] = "Máximo de mensajes privados por día de gente desconocida:";
 App::$strings["Useful to reduce spamming"] = "Útil para reducir el envío de correo no deseado";
@@ -1269,6 +1267,8 @@ 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"] = "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.";
 App::$strings["PHP executable path"] = "Ruta del ejecutable PHP";
@@ -1331,8 +1331,8 @@ App::$strings["NEW"] = "NUEVO";
 App::$strings["Remove all files"] = "Eliminar todos los ficheros";
 App::$strings["Remove this file"] = "Eliminar este fichero";
 App::$strings["Version %s"] = "Versión %s";
-App::$strings["Installed plugins/addons/apps:"] = "Extensiones, complementos o aplicaciones instaladas:";
-App::$strings["No installed plugins/addons/apps"] = "No hay instalada ninguna extensión, complemento o aplicación";
+App::$strings["Installed plugins/addons/apps:"] = "Extensiones (plugins), complementos o aplicaciones (apps) instaladas:";
+App::$strings["No installed plugins/addons/apps"] = "No hay instalada ninguna extensión (plugin), complemento o aplicación (app)";
 App::$strings["This is a hub of \$Projectname - a global cooperative network of decentralized privacy enhanced websites."] = "Este es un sitio integrado en \$Projectname - una red cooperativa mundial de sitios web descentralizados de privacidad mejorada.";
 App::$strings["Tag: "] = "Etiqueta:";
 App::$strings["Last background fetch: "] = "Última actualización en segundo plano:";
@@ -1354,6 +1354,7 @@ App::$strings["Import all or selected content from the following channel into th
 App::$strings["Only import content with these words (one per line)"] = "Importar solo contenido que contenga estas palabras (una por línea)";
 App::$strings["Leave blank to import all public content"] = "Dejar en blanco para importar todo el contenido público";
 App::$strings["Channel Name"] = "Nombre del canal";
+App::$strings["Add the following categories to posts imported from this source (comma separated)"] = "Añadir las categorías siguientes a las entradas importadas de esta fuente (separadas por comas)";
 App::$strings["Source not found."] = "Fuente no encontrada";
 App::$strings["Edit Source"] = "Editar fuente";
 App::$strings["Delete Source"] = "Eliminar fuente";
@@ -1452,64 +1453,15 @@ App::$strings["School/education:"] = "Estudios:";
 App::$strings["Like this thing"] = "Me gusta esto";
 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["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["Image"] = "Imagen";
-App::$strings["Insert Link"] = "Insertar enlace";
-App::$strings["Video"] = "Vídeo";
-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["Administrator"] = "Administrador";
-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["Embedded content"] = "Contenido incorporado";
+App::$strings["Embedding disabled"] = "Incrustación deshabilitada";
+App::$strings["Visible to your default audience"] = "Visible para su público predeterminado.";
+App::$strings["Limit access:"] = "Acceso limitado: ";
+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["Currently Male"] = "Actualmente hombre";
 App::$strings["Currently Female"] = "Actualmente mujer";
 App::$strings["Mostly Male"] = "Generalmente hombre";
@@ -1565,239 +1517,11 @@ 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["Visible to your default audience"] = "Visible para su público predeterminado.";
-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[" 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["prev"] = "anterior";
-App::$strings["first"] = "primera";
-App::$strings["last"] = "última";
-App::$strings["next"] = "próxima";
-App::$strings["older"] = "más antiguas";
-App::$strings["newer"] = "más recientes";
-App::$strings["No connections"] = "Sin conexiones";
-App::$strings["View all %s connections"] = "Ver todas las %s conexiones";
-App::$strings["poke"] = "un toque";
-App::$strings["poked"] = "ha dado un toque a";
-App::$strings["ping"] = "un \"ping\"";
-App::$strings["pinged"] = "ha enviado un \"ping\" a";
-App::$strings["prod"] = "una incitación ";
-App::$strings["prodded"] = "ha incitado a ";
-App::$strings["slap"] = "una bofetada ";
-App::$strings["slapped"] = "ha abofeteado a ";
-App::$strings["finger"] = "un \"finger\" ";
-App::$strings["fingered"] = "envió un \"finger\" a";
-App::$strings["rebuff"] = "un reproche";
-App::$strings["rebuffed"] = "ha hecho un reproche a ";
-App::$strings["happy"] = "feliz ";
-App::$strings["sad"] = "triste ";
-App::$strings["mellow"] = "tranquilo/a";
-App::$strings["tired"] = "cansado/a ";
-App::$strings["perky"] = "vivaz";
-App::$strings["angry"] = "enfadado/a";
-App::$strings["stupefied"] = "asombrado/a";
-App::$strings["puzzled"] = "perplejo/a";
-App::$strings["interested"] = "interesado/a";
-App::$strings["bitter"] = "amargado/a";
-App::$strings["cheerful"] = "alegre";
-App::$strings["alive"] = "animado/a";
-App::$strings["annoyed"] = "molesto/a";
-App::$strings["anxious"] = "ansioso/a";
-App::$strings["cranky"] = "de mal humor";
-App::$strings["disturbed"] = "perturbado/a";
-App::$strings["frustrated"] = "frustrado/a";
-App::$strings["depressed"] = "deprimido/a";
-App::$strings["motivated"] = "motivado/a";
-App::$strings["relaxed"] = "relajado/a";
-App::$strings["surprised"] = "sorprendido/a";
-App::$strings["Monday"] = "lunes";
-App::$strings["Tuesday"] = "martes";
-App::$strings["Wednesday"] = "miércoles";
-App::$strings["Thursday"] = "jueves";
-App::$strings["Friday"] = "viernes";
-App::$strings["Saturday"] = "sábado";
-App::$strings["Sunday"] = "domingo";
-App::$strings["January"] = "enero";
-App::$strings["February"] = "febrero";
-App::$strings["March"] = "marzo";
-App::$strings["April"] = "abril";
-App::$strings["May"] = "mayo";
-App::$strings["June"] = "junio";
-App::$strings["July"] = "julio";
-App::$strings["August"] = "agosto";
-App::$strings["September"] = "septiembre";
-App::$strings["October"] = "octubre";
-App::$strings["November"] = "noviembre";
-App::$strings["December"] = "diciembre";
-App::$strings["Unknown Attachment"] = "Adjunto no reconocido";
-App::$strings["unknown"] = "desconocido";
-App::$strings["remove category"] = "eliminar categoría";
-App::$strings["remove from file"] = "eliminar del fichero";
-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["default"] = "por defecto";
-App::$strings["Page layout"] = "Plantilla de la página";
-App::$strings["You can create your own with the layouts tool"] = "Puede crear su propia disposición gráfica con la herramienta de plantillas";
-App::$strings["Page content type"] = "Tipo de contenido de la página";
-App::$strings["Select an alternate language"] = "Seleccionar un idioma alternativo";
-App::$strings["activity"] = "la actividad";
-App::$strings["Design Tools"] = "Herramientas de diseño web";
-App::$strings["Pages"] = "Páginas";
-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["Site Admin"] = "Administrador del sitio";
-App::$strings["Bookmarks"] = "Marcadores";
-App::$strings["Address Book"] = "Libreta de direcciones";
-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["Install"] = "Instalar";
-App::$strings["Purchase"] = "Comprar";
-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["Attachments:"] = "Ficheros adjuntos:";
-App::$strings["\$Projectname event notification:"] = "Notificación de eventos de \$Projectname:";
-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["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 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["Visible to <strong>everybody</strong>"] = "Visible para <strong>cualquiera</strong>";
-App::$strings["Please enter a video link/URL:"] = "Por favor, introduzca un enlace de vídeo:";
-App::$strings["Please enter an audio link/URL:"] = "Por favor, introduzca un enlace de audio:";
-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["upload photo"] = "subir foto";
-App::$strings["attach file"] = "adjuntar fichero";
-App::$strings["web link"] = "enlace web";
-App::$strings["Insert video link"] = "Insertar enlace de vídeo";
-App::$strings["video link"] = "enlace de vídeo";
-App::$strings["Insert audio link"] = "Insertar enlace de audio";
-App::$strings["audio link"] = "enlace de audio";
-App::$strings["set location"] = "establecer ubicación";
-App::$strings["clear location"] = "borrar los datos de ubicación";
-App::$strings["permissions"] = "permisos";
-App::$strings["Set publish date"] = "Establecer la fecha de publicación";
-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["Photo Albums"] = "�lbumes de fotos";
-App::$strings["Files and Storage"] = "Ficheros y repositorio";
-App::$strings["Chatrooms"] = "Salas de chat";
-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["%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["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["Logged out."] = "Desconectado/a.";
-App::$strings["Failed authentication"] = "Autenticación fallida.";
-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["Public Timeline"] = "Cronología pública";
-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["%d invitation available"] = array(
 	0 => "%d invitación pendiente",
 	1 => "%d invitaciones disponibles",
@@ -1817,6 +1541,189 @@ App::$strings["%d connection in common"] = array(
 	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["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["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["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["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["%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["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["Logged out."] = "Desconectado/a.";
+App::$strings["Failed authentication"] = "Autenticación fallida.";
+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["(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["Logout"] = "Finalizar sesión";
+App::$strings["End this session"] = "Finalizar esta sesión";
+App::$strings["Home"] = "Inicio";
+App::$strings["Your posts and conversations"] = "Sus publicaciones y conversaciones";
+App::$strings["Your profile page"] = "Su página del perfil";
+App::$strings["Manage/Edit profiles"] = "Administrar/editar perfiles";
+App::$strings["Edit your profile"] = "Editar su perfil";
+App::$strings["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";
+App::$strings["Click to authenticate to your home hub"] = "Pulsar para identificarse en su servidor de inicio";
+App::$strings["Home Page"] = "Página de inicio";
+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["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["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["view full size"] = "Ver en el tamaño original";
+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["Administrator"] = "Administrador";
+App::$strings["No Subject"] = "Sin asunto";
+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["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.";
@@ -1872,10 +1779,6 @@ 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.";
@@ -1912,12 +1815,51 @@ 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["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["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["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";
@@ -1962,7 +1904,6 @@ App::$strings["Search by Date"] = "Buscar por fecha";
 App::$strings["Ability to select posts by date ranges"] = "Capacidad de seleccionar entradas por rango de fechas";
 App::$strings["Privacy Groups"] = "Grupos de canales";
 App::$strings["Enable management and selection of privacy groups"] = "Activar la gestión y selección de grupos de canales";
-App::$strings["Saved Searches"] = "Búsquedas guardadas";
 App::$strings["Save search terms for re-use"] = "Guardar términos de búsqueda para su reutilización";
 App::$strings["Network Personal Tab"] = "Actividad personal";
 App::$strings["Enable tab to display only Network posts that you've interacted on"] = "Habilitar una pestaña en la cual se muestren solo las entradas en las que ha participado.";
@@ -1999,7 +1940,6 @@ 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["add"] = "añadir";
 App::$strings["Image/photo"] = "Imagen/foto";
 App::$strings["Encrypted content"] = "Contenido cifrado";
 App::$strings["Install %s element: "] = "Instalar el elemento %s:";
@@ -2009,82 +1949,178 @@ 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["(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["view full size"] = "Ver en el tamaño original";
-App::$strings["No Subject"] = "Sin asunto";
-App::$strings["System"] = "Sistema";
-App::$strings["Create Personal App"] = "Crear una aplicación personal";
-App::$strings["Edit Personal App"] = "Editar una aplicación personal";
-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["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 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["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["Admin"] = "Administrador";
-App::$strings["Plugin Features"] = "Extensiones";
+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";
+App::$strings["next"] = "próxima";
+App::$strings["older"] = "más antiguas";
+App::$strings["newer"] = "más recientes";
+App::$strings["No connections"] = "Sin conexiones";
+App::$strings["View all %s connections"] = "Ver todas las %s conexiones";
+App::$strings["poke"] = "un toque";
+App::$strings["ping"] = "un \"ping\"";
+App::$strings["pinged"] = "ha enviado un \"ping\" a";
+App::$strings["prod"] = "una incitación ";
+App::$strings["prodded"] = "ha incitado a ";
+App::$strings["slap"] = "una bofetada ";
+App::$strings["slapped"] = "ha abofeteado a ";
+App::$strings["finger"] = "un \"finger\" ";
+App::$strings["fingered"] = "envió un \"finger\" a";
+App::$strings["rebuff"] = "un reproche";
+App::$strings["rebuffed"] = "ha hecho un reproche a ";
+App::$strings["happy"] = "feliz ";
+App::$strings["sad"] = "triste ";
+App::$strings["mellow"] = "tranquilo/a";
+App::$strings["tired"] = "cansado/a ";
+App::$strings["perky"] = "vivaz";
+App::$strings["angry"] = "enfadado/a";
+App::$strings["stupefied"] = "asombrado/a";
+App::$strings["puzzled"] = "perplejo/a";
+App::$strings["interested"] = "interesado/a";
+App::$strings["bitter"] = "amargado/a";
+App::$strings["cheerful"] = "alegre";
+App::$strings["alive"] = "animado/a";
+App::$strings["annoyed"] = "molesto/a";
+App::$strings["anxious"] = "ansioso/a";
+App::$strings["cranky"] = "de mal humor";
+App::$strings["disturbed"] = "perturbado/a";
+App::$strings["frustrated"] = "frustrado/a";
+App::$strings["depressed"] = "deprimido/a";
+App::$strings["motivated"] = "motivado/a";
+App::$strings["relaxed"] = "relajado/a";
+App::$strings["surprised"] = "sorprendido/a";
+App::$strings["Monday"] = "lunes";
+App::$strings["Tuesday"] = "martes";
+App::$strings["Wednesday"] = "miércoles";
+App::$strings["Thursday"] = "jueves";
+App::$strings["Friday"] = "viernes";
+App::$strings["Saturday"] = "sábado";
+App::$strings["Sunday"] = "domingo";
+App::$strings["January"] = "enero";
+App::$strings["February"] = "febrero";
+App::$strings["March"] = "marzo";
+App::$strings["April"] = "abril";
+App::$strings["May"] = "mayo";
+App::$strings["June"] = "junio";
+App::$strings["July"] = "julio";
+App::$strings["August"] = "agosto";
+App::$strings["September"] = "septiembre";
+App::$strings["October"] = "octubre";
+App::$strings["November"] = "noviembre";
+App::$strings["December"] = "diciembre";
+App::$strings["Unknown Attachment"] = "Adjunto no reconocido";
+App::$strings["unknown"] = "desconocido";
+App::$strings["remove category"] = "eliminar categoría";
+App::$strings["remove from file"] = "eliminar del fichero";
+App::$strings["default"] = "por defecto";
+App::$strings["Page layout"] = "Plantilla de la página";
+App::$strings["You can create your own with the layouts tool"] = "Puede crear su propia disposición gráfica con la herramienta de plantillas";
+App::$strings["Page content type"] = "Tipo de contenido de la página";
+App::$strings["Select an alternate language"] = "Seleccionar un idioma alternativo";
+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["Tags"] = "Etiquetas";
 App::$strings["Keywords"] = "Palabras clave";
 App::$strings["have"] = "tener";
@@ -2093,12 +2129,26 @@ App::$strings["want"] = "quiero";
 App::$strings["wants"] = "quiere";
 App::$strings["likes"] = "gusta de";
 App::$strings["dislikes"] = "no gusta de";
+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 me (only specified contacts and me)"] = "Sólo yo (sólo los contactos especificados y yo)";
+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";
 App::$strings["[-] collapse"] = "[-] contraer";
 App::$strings["Password too short"] = "Contraseña demasiado corta";
 App::$strings["Passwords do not match"] = "Las contraseñas no coinciden";
+App::$strings["everybody"] = "cualquiera";
 App::$strings["Secret Passphrase"] = "Contraseña secreta";
 App::$strings["Passphrase hint"] = "Pista de contraseña";
 App::$strings["Notice: Permissions have changed but have not yet been submitted."] = "Aviso: los permisos han cambiado pero aún no han sido enviados.";
@@ -2154,48 +2204,7 @@ App::$strings["No recipient provided."] = "No se ha especificado ningún destina
 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["Logout"] = "Finalizar sesión";
-App::$strings["End this session"] = "Finalizar esta sesión";
-App::$strings["Home"] = "Inicio";
-App::$strings["Your posts and conversations"] = "Sus publicaciones y conversaciones";
-App::$strings["Your profile page"] = "Su página del perfil";
-App::$strings["Manage/Edit profiles"] = "Administrar/editar perfiles";
-App::$strings["Edit your profile"] = "Editar su perfil";
-App::$strings["Your photos"] = "Sus fotos";
-App::$strings["Your files"] = "Sus ficheros";
-App::$strings["Your chatrooms"] = "Sus salas de chat";
-App::$strings["Your bookmarks"] = "Sus marcadores";
-App::$strings["Your webpages"] = "Sus páginas web";
-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";
-App::$strings["Click to authenticate to your home hub"] = "Pulsar para identificarse en su servidor de inicio";
-App::$strings["Home Page"] = "Página de inicio";
-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["Channel Directory"] = "Directorio de canales";
-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["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["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["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["Site Setup and Configuration"] = "Ajustes y configuración del sitio";
-App::$strings["@name, #tag, ?doc, content"] = "@nombre, #etiqueta, ?ayuda, contenido";
-App::$strings["Please wait..."] = "Espere por favor…";
-App::$strings["Embedded content"] = "Contenido incorporado";
-App::$strings["Embedding disabled"] = "Incrustación deshabilitada";
+App::$strings["Public Timeline"] = "Cronología pública";
 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";
@@ -2233,12 +2242,20 @@ 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["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["Upload New Photos"] = "Subir nuevas fotos";
+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["Focus (Hubzilla default)"] = "Focus (predefinido)";
 App::$strings["Theme settings"] = "Ajustes del tema";
 App::$strings["Select scheme"] = "Elegir un esquema";
diff --git a/view/js/acl.js b/view/js/acl.js
index 162ada764..a04cf9d86 100644
--- a/view/js/acl.js
+++ b/view/js/acl.js
@@ -11,30 +11,44 @@ function ACL(backend_url, preset) {
 	that.deny_cid  = (preset[2] || []);
 	that.deny_gid  = (preset[3] || []);
 	that.group_uids = [];
-	that.nw = 4; //items per row. should be calulated from #acl-list.width
 
+	that.info         = $("#acl-info");
+	that.list         = $("#acl-list");
 	that.list_content = $("#acl-list-content");
 	that.item_tpl     = unescape($(".acl-list-item[rel=acl-template]").html());
 	that.showall      = $("#acl-showall");
 	that.showlimited  = $("#acl-showlimited");
+	that.acl_select   = $("#acl-select");
+
+	that.preset = preset;
+	that.self = [];
 
 	// set the initial ACL lists in case the enclosing form gets submitted before the ajax loader completes. 
 	that.on_submit();
 
-	if (preset.length === 0) that.showall.removeClass("btn-default").addClass("btn-warning");
-
 	/*events*/
 
 	$(document).ready(function() {
-			that.showall.click(that.on_showall);
-			that.showlimited.click(that.on_showlimited);
-			$(document).on('click','.acl-button-show',that.on_button_show);
-			$(document).on('click','.acl-button-hide',that.on_button_hide);
-			$("#acl-search").keypress(that.on_search);
 
-			/* startup! */
-			that.get(0,15000);
-			that.on_submit();
+		that.acl_select.change(function(event) {
+			var option = that.acl_select.val();
+
+			if(option == 'option1') { // public
+				that.on_showall(event);
+			}
+
+			if(option == 'option2') { // restricted
+				that.on_showlimited(event);
+			}
+		});
+
+		$(document).on('click','.acl-button-show',that.on_button_show);
+		$(document).on('click','.acl-button-hide',that.on_button_hide);
+		$("#acl-search").keypress(that.on_search);
+
+		/* startup! */
+		that.get(0,15000);
+		that.on_submit();
 	});
 }
 
@@ -73,15 +87,9 @@ ACL.prototype.on_search = function(event) {
 };
 
 ACL.prototype.on_showall = function(event) {
-
 	// preventDefault() isn't called here as we want state changes from update_view() to be applied to the radiobutton
 	event.stopPropagation();
 
-	if (that.showall.hasClass("btn-warning")) {
-		return false;
-	}
-	that.showall.removeClass("btn-default").addClass("btn-warning");
-
 	that.allow_cid = [];
 	that.allow_gid = [];
 	that.deny_cid  = [];
@@ -94,11 +102,22 @@ ACL.prototype.on_showall = function(event) {
 };
 
 ACL.prototype.on_showlimited = function(event) {
-	// Prevent the radiobutton from being selected, as the showlimited radiobutton
-	// option is selected only by selecting show or hide options on channels or groups.
-	event.preventDefault();
+	// preventDefault() isn't called here as we want state changes from update_view() to be applied to the radiobutton
 	event.stopPropagation();
-	return false;
+
+	if(that.preset[0].length === 0 && that.preset[1].length === 0 && that.preset[2].length === 0 && that.preset[3].length === 0) {
+		that.preset[0] = [that.self[0]];
+	}
+
+	that.allow_cid = (that.preset[0] || []);
+	that.allow_gid = (that.preset[1] || []);
+	that.deny_cid  = (that.preset[2] || []);
+	that.deny_gid  = (that.preset[3] || []);
+
+	that.update_view();
+	that.on_submit();
+
+	return true; // return true so that state changes from update_view() will be applied
 }
 
 ACL.prototype.on_selectall = function(event) {
@@ -199,29 +218,26 @@ ACL.prototype.set_deny = function(itemid) {
 	that.update_view();
 };
 
-ACL.prototype.update_radiobuttons = function(isPublic) {
-
-	that.showall.prop('checked', isPublic);
-	that.showlimited.prop('checked', !isPublic);
-	that.showlimited.prop('disabled', isPublic);
+ACL.prototype.update_select = function(isPublic) {
+	that.showall.prop('selected', isPublic);
+	that.showlimited.prop('selected', !isPublic);
 };
 
 ACL.prototype.update_view = function() {
-	if (that.allow_gid.length === 0 && that.allow_cid.length === 0 &&
-		that.deny_gid.length === 0 && that.deny_cid.length === 0) {
-			// btn-warning indicates that the permissions are public, it was chosen because
-			// that.showall used to be a normal button, which btn-warning is a bootstrap style for.
-			that.showall.removeClass("btn-default").addClass("btn-warning");
-			that.update_radiobuttons(true);
+	if (that.allow_gid.length === 0 && that.allow_cid.length === 0 && that.deny_gid.length === 0 && that.deny_cid.length === 0) {
+		that.list.hide(); //hide acl-list
+		that.info.show(); //show acl-info
+		that.update_select(true);
 
-			/* jot acl */
-			$('#jot-perms-icon, #dialog-perms-icon').removeClass('fa-lock').addClass('fa-unlock');
-			$('#jot-public').show();
-			$('.profile-jot-net input').attr('disabled', false);
+		/* jot acl */
+		$('#jot-perms-icon, #dialog-perms-icon').removeClass('fa-lock').addClass('fa-unlock');
+		$('#jot-public').show();
+		$('.profile-jot-net input').attr('disabled', false);
 
 	} else {
-		that.showall.removeClass("btn-warning").addClass("btn-default");
-		that.update_radiobuttons(false);
+		that.list.show(); //show acl-list
+		that.info.hide(); //hide acl-info
+		that.update_select(false);
 
 		/* jot acl */
 		$('#jot-perms-icon, #dialog-perms-icon').removeClass('fa-unlock').addClass('fa-lock');
@@ -300,12 +316,11 @@ ACL.prototype.get = function(start, count, search) {
 };
 
 ACL.prototype.populate = function(data) {
-	var height = Math.ceil(data.items.length / that.nw) * 42;
-	that.list_content.height(height);
 	$(data.items).each(function(){
 		html = "<div class='acl-list-item {4} {7} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>";
 		html = html.format(this.photo, this.name, this.type, this.xid, '', this.self, this.link, this.taggable);
 		if (this.uids !== undefined) that.group_uids[this.xid] = this.uids;
+		if (this.self === 'abook-self') that.self[0] = this.xid;
 		//console.log(html);
 		that.list_content.append(html);
 	});
diff --git a/view/nl/hmessages.po b/view/nl/hmessages.po
index 10ca94afc..f08f18f5d 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-04-29 00:01-0700\n"
-"PO-Revision-Date: 2016-04-30 11:56+0000\n"
+"POT-Creation-Date: 2016-05-13 00:02-0700\n"
+"PO-Revision-Date: 2016-05-16 12:37+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:2606
+#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2632
 msgid "Collection"
 msgstr "map"
 
@@ -46,16 +46,16 @@ msgstr "Planning-postvak IN"
 msgid "Schedule Outbox"
 msgstr "Planning-postvak UIT"
 
-#: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Module/Photos.php:797
-#: ../../Zotlabs/Module/Photos.php:1242 ../../include/apps.php:360
-#: ../../include/apps.php:415 ../../include/conversation.php:1037
-#: ../../include/widgets.php:1457
+#: ../../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
 msgid "Unknown"
 msgstr "Onbekend"
 
 #: ../../Zotlabs/Storage/Browser.php:226 ../../Zotlabs/Module/Fbrowser.php:85
-#: ../../include/apps.php:135 ../../include/conversation.php:1657
-#: ../../include/nav.php:93
+#: ../../include/nav.php:93 ../../include/conversation.php:1645
+#: ../../include/apps.php:167
 msgid "Files"
 msgstr "Bestanden"
 
@@ -68,22 +68,22 @@ msgid "Shared"
 msgstr "Gedeeld"
 
 #: ../../Zotlabs/Storage/Browser.php:230 ../../Zotlabs/Storage/Browser.php:303
-#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Layouts.php:180
+#: ../../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:188
+#: ../../Zotlabs/Module/Webpages.php:186
 msgid "Create"
 msgstr "Aanmaken"
 
 #: ../../Zotlabs/Storage/Browser.php:231 ../../Zotlabs/Storage/Browser.php:305
 #: ../../Zotlabs/Module/Cover_photo.php:357
-#: ../../Zotlabs/Module/Photos.php:824 ../../Zotlabs/Module/Photos.php:1366
-#: ../../Zotlabs/Module/Profile_photo.php:368 ../../include/widgets.php:1470
+#: ../../Zotlabs/Module/Photos.php:825 ../../Zotlabs/Module/Photos.php:1367
+#: ../../Zotlabs/Module/Profile_photo.php:368 ../../include/widgets.php:1519
 msgid "Upload"
 msgstr "Uploaden"
 
-#: ../../Zotlabs/Storage/Browser.php:235 ../../Zotlabs/Module/Admin.php:1166
-#: ../../Zotlabs/Module/Chat.php:245 ../../Zotlabs/Module/Settings.php:590
-#: ../../Zotlabs/Module/Settings.php:616
+#: ../../Zotlabs/Storage/Browser.php:235 ../../Zotlabs/Module/Admin.php:1208
+#: ../../Zotlabs/Module/Chat.php:245 ../../Zotlabs/Module/Settings.php:592
+#: ../../Zotlabs/Module/Settings.php:618
 #: ../../Zotlabs/Module/Sharedwithme.php:99
 msgid "Name"
 msgstr "Naam"
@@ -93,7 +93,7 @@ msgid "Type"
 msgstr "Type"
 
 #: ../../Zotlabs/Storage/Browser.php:237
-#: ../../Zotlabs/Module/Sharedwithme.php:101 ../../include/text.php:1293
+#: ../../Zotlabs/Module/Sharedwithme.php:101 ../../include/text.php:1322
 msgid "Size"
 msgstr "Grootte"
 
@@ -102,35 +102,35 @@ msgstr "Grootte"
 msgid "Last Modified"
 msgstr "Laatst gewijzigd"
 
-#: ../../Zotlabs/Storage/Browser.php:240 ../../Zotlabs/Module/Admin.php:1775
-#: ../../Zotlabs/Module/Blocks.php:159
+#: ../../Zotlabs/Storage/Browser.php:240 ../../Zotlabs/Module/Admin.php:2075
+#: ../../Zotlabs/Module/Blocks.php:157
 #: ../../Zotlabs/Module/Connections.php:290
 #: ../../Zotlabs/Module/Connections.php:310
-#: ../../Zotlabs/Module/Editblock.php:140
-#: ../../Zotlabs/Module/Editlayout.php:139
-#: ../../Zotlabs/Module/Editpost.php:118
-#: ../../Zotlabs/Module/Editwebpage.php:181
-#: ../../Zotlabs/Module/Layouts.php:188 ../../Zotlabs/Module/Menu.php:112
-#: ../../Zotlabs/Module/Settings.php:650 ../../Zotlabs/Module/Thing.php:260
-#: ../../Zotlabs/Module/Webpages.php:189 ../../include/identity.php:930
-#: ../../include/identity.php:934 ../../include/ItemObject.php:100
-#: ../../include/apps.php:259 ../../include/menu.php:108
-#: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36
+#: ../../Zotlabs/Module/Editblock.php:109
+#: ../../Zotlabs/Module/Editlayout.php:113
+#: ../../Zotlabs/Module/Editpost.php:84
+#: ../../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
 msgid "Edit"
 msgstr "Bewerken"
 
-#: ../../Zotlabs/Storage/Browser.php:241 ../../Zotlabs/Module/Admin.php:1001
-#: ../../Zotlabs/Module/Admin.php:1160 ../../Zotlabs/Module/Admin.php:1776
-#: ../../Zotlabs/Module/Blocks.php:161
+#: ../../Zotlabs/Storage/Browser.php:241 ../../Zotlabs/Module/Admin.php:1043
+#: ../../Zotlabs/Module/Admin.php:1202 ../../Zotlabs/Module/Admin.php:2076
+#: ../../Zotlabs/Module/Blocks.php:159
 #: ../../Zotlabs/Module/Connections.php:263
 #: ../../Zotlabs/Module/Connedit.php:573
-#: ../../Zotlabs/Module/Editblock.php:180
-#: ../../Zotlabs/Module/Editlayout.php:184
-#: ../../Zotlabs/Module/Editwebpage.php:221 ../../Zotlabs/Module/Group.php:177
-#: ../../Zotlabs/Module/Photos.php:1172 ../../Zotlabs/Module/Settings.php:651
-#: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Module/Webpages.php:191
-#: ../../include/ItemObject.php:120 ../../include/apps.php:260
-#: ../../include/conversation.php:657
+#: ../../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
 msgid "Delete"
 msgstr "Verwijderen"
 
@@ -158,42 +158,42 @@ 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:70 ../../Zotlabs/Module/Authtest.php:16
+#: ../../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:104
-#: ../../Zotlabs/Module/Channel.php:224 ../../Zotlabs/Module/Channel.php:264
+#: ../../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/Module/Connedit.php:366
 #: ../../Zotlabs/Module/Cover_photo.php:277
 #: ../../Zotlabs/Module/Cover_photo.php:290
-#: ../../Zotlabs/Module/Editblock.php:69
+#: ../../Zotlabs/Module/Editblock.php:67
 #: ../../Zotlabs/Module/Editlayout.php:67
-#: ../../Zotlabs/Module/Editlayout.php:91 ../../Zotlabs/Module/Editpost.php:17
-#: ../../Zotlabs/Module/Editwebpage.php:68
+#: ../../Zotlabs/Module/Editlayout.php:90 ../../Zotlabs/Module/Editpost.php:17
+#: ../../Zotlabs/Module/Editwebpage.php:69
 #: ../../Zotlabs/Module/Editwebpage.php:90
 #: ../../Zotlabs/Module/Editwebpage.php:105
-#: ../../Zotlabs/Module/Editwebpage.php:129
-#: ../../Zotlabs/Module/Events.php:264 ../../Zotlabs/Module/Filestorage.php:22
-#: ../../Zotlabs/Module/Filestorage.php:77
-#: ../../Zotlabs/Module/Filestorage.php:92
-#: ../../Zotlabs/Module/Filestorage.php:119
+#: ../../Zotlabs/Module/Editwebpage.php:127
+#: ../../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/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:73 ../../Zotlabs/Module/Layouts.php:80
-#: ../../Zotlabs/Module/Layouts.php:91 ../../Zotlabs/Module/Like.php:181
+#: ../../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/Manage.php:10 ../../Zotlabs/Module/Menu.php:78
 #: ../../Zotlabs/Module/Message.php:20 ../../Zotlabs/Module/Mitem.php:115
-#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Network.php:16
+#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Network.php:17
 #: ../../Zotlabs/Module/New_channel.php:77
 #: ../../Zotlabs/Module/New_channel.php:104
 #: ../../Zotlabs/Module/Notifications.php:70 ../../Zotlabs/Module/Page.php:35
 #: ../../Zotlabs/Module/Page.php:90 ../../Zotlabs/Module/Pdledit.php:26
-#: ../../Zotlabs/Module/Photos.php:74 ../../Zotlabs/Module/Poke.php:137
+#: ../../Zotlabs/Module/Photos.php:75 ../../Zotlabs/Module/Poke.php:137
 #: ../../Zotlabs/Module/Profile.php:68 ../../Zotlabs/Module/Profile.php:76
 #: ../../Zotlabs/Module/Profile_photo.php:256
 #: ../../Zotlabs/Module/Profile_photo.php:269
@@ -201,22 +201,22 @@ msgstr "Bestand uploaden"
 #: ../../Zotlabs/Module/Rate.php:115 ../../Zotlabs/Module/Register.php:77
 #: ../../Zotlabs/Module/Regmod.php:21
 #: ../../Zotlabs/Module/Service_limits.php:11
-#: ../../Zotlabs/Module/Settings.php:570 ../../Zotlabs/Module/Setup.php:238
+#: ../../Zotlabs/Module/Settings.php:572 ../../Zotlabs/Module/Setup.php:238
 #: ../../Zotlabs/Module/Sharedwithme.php:11
-#: ../../Zotlabs/Module/Sources.php:70 ../../Zotlabs/Module/Suggest.php:30
+#: ../../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/Viewsrc.php:18 ../../Zotlabs/Module/Webpages.php:73
-#: ../../include/chat.php:133 ../../include/attach.php:141
+#: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Webpages.php:74
+#: ../../include/photos.php:29 ../../include/chat.php:133
+#: ../../include/items.php:3439 ../../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:4671
-#: ../../include/photos.php:29 ../../index.php:174
+#: ../../include/attach.php:1118 ../../index.php:174
 msgid "Permission denied."
 msgstr "Toegang geweigerd."
 
@@ -243,12 +243,12 @@ msgid "Welcome %s. Remote authentication successful."
 msgstr "Welkom %s. Authenticatie op afstand geslaagd."
 
 #: ../../Zotlabs/Module/Achievements.php:15 ../../Zotlabs/Module/Blocks.php:33
-#: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Editblock.php:33
+#: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Editblock.php:31
 #: ../../Zotlabs/Module/Editlayout.php:31
-#: ../../Zotlabs/Module/Editwebpage.php:32
-#: ../../Zotlabs/Module/Filestorage.php:58 ../../Zotlabs/Module/Hcard.php:12
-#: ../../Zotlabs/Module/Layouts.php:33 ../../Zotlabs/Module/Profile.php:20
-#: ../../Zotlabs/Module/Webpages.php:33 ../../include/identity.php:830
+#: ../../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
 msgid "Requested profile is not available."
 msgstr "Opgevraagd profiel is niet beschikbaar"
 
@@ -264,1026 +264,1128 @@ msgstr "netwerk"
 msgid "RSS"
 msgstr "RSS"
 
-#: ../../Zotlabs/Module/Admin.php:58
+#: ../../Zotlabs/Module/Admin.php:77
 msgid "Theme settings updated."
 msgstr "Thema-instellingen bijgewerkt."
 
-#: ../../Zotlabs/Module/Admin.php:145 ../../Zotlabs/Module/Admin.php:1197
-#: ../../Zotlabs/Module/Admin.php:1442 ../../Zotlabs/Module/Display.php:44
-#: ../../Zotlabs/Module/Filestorage.php:31 ../../Zotlabs/Module/Thing.php:89
-#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:4592
+#: ../../Zotlabs/Module/Admin.php:164 ../../Zotlabs/Module/Admin.php:1239
+#: ../../Zotlabs/Module/Admin.php:1541 ../../Zotlabs/Module/Display.php:44
+#: ../../Zotlabs/Module/Filestorage.php:33 ../../Zotlabs/Module/Thing.php:89
+#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:3360
 msgid "Item not found."
 msgstr "Item niet gevonden."
 
-#: ../../Zotlabs/Module/Admin.php:178
+#: ../../Zotlabs/Module/Admin.php:197
 msgid "# Accounts"
 msgstr "# accounts"
 
-#: ../../Zotlabs/Module/Admin.php:179
+#: ../../Zotlabs/Module/Admin.php:198
 msgid "# blocked accounts"
 msgstr "# geblokkeerde accounts"
 
-#: ../../Zotlabs/Module/Admin.php:180
+#: ../../Zotlabs/Module/Admin.php:199
 msgid "# expired accounts"
 msgstr "# verlopen accounts"
 
-#: ../../Zotlabs/Module/Admin.php:181
+#: ../../Zotlabs/Module/Admin.php:200
 msgid "# expiring accounts"
 msgstr "# accounts die nog moeten verlopen"
 
-#: ../../Zotlabs/Module/Admin.php:192
+#: ../../Zotlabs/Module/Admin.php:211
 msgid "# Channels"
 msgstr "# Kanalen"
 
-#: ../../Zotlabs/Module/Admin.php:193
+#: ../../Zotlabs/Module/Admin.php:212
 msgid "# primary"
 msgstr "# primair"
 
-#: ../../Zotlabs/Module/Admin.php:194
+#: ../../Zotlabs/Module/Admin.php:213
 msgid "# clones"
 msgstr "# klonen"
 
-#: ../../Zotlabs/Module/Admin.php:200
+#: ../../Zotlabs/Module/Admin.php:219
 msgid "Message queues"
 msgstr "Berichtenwachtrij"
 
-#: ../../Zotlabs/Module/Admin.php:216 ../../Zotlabs/Module/Admin.php:462
-#: ../../Zotlabs/Module/Admin.php:677 ../../Zotlabs/Module/Admin.php:717
-#: ../../Zotlabs/Module/Admin.php:992 ../../Zotlabs/Module/Admin.php:1156
-#: ../../Zotlabs/Module/Admin.php:1271 ../../Zotlabs/Module/Admin.php:1332
-#: ../../Zotlabs/Module/Admin.php:1493 ../../Zotlabs/Module/Admin.php:1527
-#: ../../Zotlabs/Module/Admin.php:1612
+#: ../../Zotlabs/Module/Admin.php:236
+msgid "Your software should be updated"
+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:1592 ../../Zotlabs/Module/Admin.php:1626
+#: ../../Zotlabs/Module/Admin.php:1711
 msgid "Administration"
 msgstr "Beheer"
 
-#: ../../Zotlabs/Module/Admin.php:217
+#: ../../Zotlabs/Module/Admin.php:242
 msgid "Summary"
 msgstr "Samenvatting"
 
-#: ../../Zotlabs/Module/Admin.php:220
+#: ../../Zotlabs/Module/Admin.php:245
 msgid "Registered accounts"
 msgstr "Geregistreerde accounts"
 
-#: ../../Zotlabs/Module/Admin.php:221 ../../Zotlabs/Module/Admin.php:681
+#: ../../Zotlabs/Module/Admin.php:246 ../../Zotlabs/Module/Admin.php:715
 msgid "Pending registrations"
 msgstr "Accounts die op goedkeuring wachten"
 
-#: ../../Zotlabs/Module/Admin.php:222
+#: ../../Zotlabs/Module/Admin.php:247
 msgid "Registered channels"
 msgstr "Geregistreerde kanalen"
 
-#: ../../Zotlabs/Module/Admin.php:223 ../../Zotlabs/Module/Admin.php:682
+#: ../../Zotlabs/Module/Admin.php:248 ../../Zotlabs/Module/Admin.php:716
 msgid "Active plugins"
 msgstr "Ingeschakelde plugins"
 
-#: ../../Zotlabs/Module/Admin.php:224
+#: ../../Zotlabs/Module/Admin.php:249
 msgid "Version"
 msgstr "Versie"
 
-#: ../../Zotlabs/Module/Admin.php:345
+#: ../../Zotlabs/Module/Admin.php:250
+msgid "Repository version (master)"
+msgstr "Versie repository (master)"
+
+#: ../../Zotlabs/Module/Admin.php:251
+msgid "Repository version (dev)"
+msgstr "Versie repository (dev)"
+
+#: ../../Zotlabs/Module/Admin.php:373
 msgid "Site settings updated."
 msgstr "Hub-instellingen bijgewerkt."
 
-#: ../../Zotlabs/Module/Admin.php:372 ../../include/comanche.php:34
+#: ../../Zotlabs/Module/Admin.php:400 ../../include/text.php:2853
 msgid "Default"
 msgstr "Standaard"
 
-#: ../../Zotlabs/Module/Admin.php:382 ../../Zotlabs/Module/Settings.php:796
+#: ../../Zotlabs/Module/Admin.php:410 ../../Zotlabs/Module/Settings.php:798
 msgid "mobile"
 msgstr "mobiel"
 
-#: ../../Zotlabs/Module/Admin.php:384
+#: ../../Zotlabs/Module/Admin.php:412
 msgid "experimental"
 msgstr "experimenteel"
 
-#: ../../Zotlabs/Module/Admin.php:386
+#: ../../Zotlabs/Module/Admin.php:414
 msgid "unsupported"
 msgstr "Niet ondersteund"
 
-#: ../../Zotlabs/Module/Admin.php:431 ../../Zotlabs/Module/Api.php:89
+#: ../../Zotlabs/Module/Admin.php:459 ../../Zotlabs/Module/Api.php:89
 #: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Connedit.php:657
-#: ../../Zotlabs/Module/Events.php:458 ../../Zotlabs/Module/Events.php:459
-#: ../../Zotlabs/Module/Events.php:468
-#: ../../Zotlabs/Module/Filestorage.php:155
-#: ../../Zotlabs/Module/Filestorage.php:163 ../../Zotlabs/Module/Menu.php:100
+#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:460
+#: ../../Zotlabs/Module/Events.php:469
+#: ../../Zotlabs/Module/Filestorage.php:157
+#: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Menu.php:100
 #: ../../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:665
+#: ../../Zotlabs/Module/Mitem.php:233 ../../Zotlabs/Module/Photos.php:666
 #: ../../Zotlabs/Module/Profiles.php:651 ../../Zotlabs/Module/Removeme.php:64
-#: ../../Zotlabs/Module/Settings.php:579 ../../include/dir_fns.php:141
+#: ../../Zotlabs/Module/Settings.php:581 ../../include/dir_fns.php:141
 #: ../../include/dir_fns.php:142 ../../include/dir_fns.php:143
 #: ../../view/theme/redbasic/php/config.php:105
 #: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1619
 msgid "No"
 msgstr "Nee"
 
-#: ../../Zotlabs/Module/Admin.php:432
+#: ../../Zotlabs/Module/Admin.php:460
 msgid "Yes - with approval"
 msgstr "Ja - met goedkeuring"
 
-#: ../../Zotlabs/Module/Admin.php:433 ../../Zotlabs/Module/Api.php:88
-#: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Events.php:458
-#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:468
-#: ../../Zotlabs/Module/Filestorage.php:155
-#: ../../Zotlabs/Module/Filestorage.php:163 ../../Zotlabs/Module/Menu.php:100
+#: ../../Zotlabs/Module/Admin.php:461 ../../Zotlabs/Module/Api.php:88
+#: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Events.php:459
+#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:469
+#: ../../Zotlabs/Module/Filestorage.php:157
+#: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Menu.php:100
 #: ../../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:665
+#: ../../Zotlabs/Module/Mitem.php:233 ../../Zotlabs/Module/Photos.php:666
 #: ../../Zotlabs/Module/Profiles.php:651 ../../Zotlabs/Module/Removeme.php:64
-#: ../../Zotlabs/Module/Settings.php:579 ../../include/dir_fns.php:141
+#: ../../Zotlabs/Module/Settings.php:581 ../../include/dir_fns.php:141
 #: ../../include/dir_fns.php:142 ../../include/dir_fns.php:143
 #: ../../view/theme/redbasic/php/config.php:105
 #: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1619
 msgid "Yes"
 msgstr "Ja"
 
-#: ../../Zotlabs/Module/Admin.php:438
+#: ../../Zotlabs/Module/Admin.php:466
 msgid "My site is not a public server"
 msgstr "Mijn $Projectname-hub is niet openbaar"
 
-#: ../../Zotlabs/Module/Admin.php:439
+#: ../../Zotlabs/Module/Admin.php:467
 msgid "My site has paid access only"
 msgstr "Mijn $Projectname-hub kent alleen betaalde toegang"
 
-#: ../../Zotlabs/Module/Admin.php:440
+#: ../../Zotlabs/Module/Admin.php:468
 msgid "My site has free access only"
 msgstr "Mijn $Projectname-hub kent alleen gratis toegang"
 
-#: ../../Zotlabs/Module/Admin.php:441
+#: ../../Zotlabs/Module/Admin.php:469
 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:463 ../../include/widgets.php:1334
+#: ../../Zotlabs/Module/Admin.php:491 ../../include/widgets.php:1383
 msgid "Site"
 msgstr "Hub-instellingen"
 
-#: ../../Zotlabs/Module/Admin.php:464 ../../Zotlabs/Module/Admin.php:654
-#: ../../Zotlabs/Module/Admin.php:729 ../../Zotlabs/Module/Admin.php:994
-#: ../../Zotlabs/Module/Admin.php:1158 ../../Zotlabs/Module/Admin.php:1334
-#: ../../Zotlabs/Module/Admin.php:1529 ../../Zotlabs/Module/Admin.php:1614
-#: ../../Zotlabs/Module/Admin.php:1778 ../../Zotlabs/Module/Appman.php:103
+#: ../../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:1628 ../../Zotlabs/Module/Admin.php:1713
+#: ../../Zotlabs/Module/Admin.php:2078 ../../Zotlabs/Module/Appman.php:125
 #: ../../Zotlabs/Module/Cal.php:341 ../../Zotlabs/Module/Chat.php:194
 #: ../../Zotlabs/Module/Chat.php:236 ../../Zotlabs/Module/Connect.php:97
-#: ../../Zotlabs/Module/Connedit.php:734 ../../Zotlabs/Module/Events.php:472
-#: ../../Zotlabs/Module/Events.php:669
-#: ../../Zotlabs/Module/Filestorage.php:160
+#: ../../Zotlabs/Module/Connedit.php:734 ../../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/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/Mood.php:139 ../../Zotlabs/Module/Pconfig.php:107
-#: ../../Zotlabs/Module/Pdledit.php:66 ../../Zotlabs/Module/Photos.php:676
-#: ../../Zotlabs/Module/Photos.php:1051 ../../Zotlabs/Module/Photos.php:1091
-#: ../../Zotlabs/Module/Photos.php:1209 ../../Zotlabs/Module/Poke.php:186
+#: ../../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:172
-#: ../../Zotlabs/Module/Settings.php:588 ../../Zotlabs/Module/Settings.php:701
-#: ../../Zotlabs/Module/Settings.php:729 ../../Zotlabs/Module/Settings.php:752
-#: ../../Zotlabs/Module/Settings.php:840
-#: ../../Zotlabs/Module/Settings.php:1032 ../../Zotlabs/Module/Setup.php:335
-#: ../../Zotlabs/Module/Setup.php:376 ../../Zotlabs/Module/Sources.php:108
-#: ../../Zotlabs/Module/Sources.php:142 ../../Zotlabs/Module/Thing.php:316
+#: ../../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/Sources.php:149 ../../Zotlabs/Module/Thing.php:316
 #: ../../Zotlabs/Module/Thing.php:362 ../../Zotlabs/Module/Xchan.php:15
-#: ../../include/ItemObject.php:703 ../../include/widgets.php:708
-#: ../../include/widgets.php:720 ../../include/js_strings.php:22
+#: ../../include/widgets.php:757 ../../include/widgets.php:769
+#: ../../include/ItemObject.php:703 ../../include/js_strings.php:22
 #: ../../view/theme/redbasic/php/config.php:99
 msgid "Submit"
 msgstr "Opslaan"
 
-#: ../../Zotlabs/Module/Admin.php:465 ../../Zotlabs/Module/Register.php:245
+#: ../../Zotlabs/Module/Admin.php:493 ../../Zotlabs/Module/Register.php:245
 msgid "Registration"
 msgstr "Registratie"
 
-#: ../../Zotlabs/Module/Admin.php:466
+#: ../../Zotlabs/Module/Admin.php:494
 msgid "File upload"
 msgstr "Bestand uploaden"
 
-#: ../../Zotlabs/Module/Admin.php:467
+#: ../../Zotlabs/Module/Admin.php:495
 msgid "Policies"
 msgstr "Beleid"
 
-#: ../../Zotlabs/Module/Admin.php:468 ../../include/contact_widgets.php:19
+#: ../../Zotlabs/Module/Admin.php:496 ../../include/contact_widgets.php:19
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: ../../Zotlabs/Module/Admin.php:472
+#: ../../Zotlabs/Module/Admin.php:500
 msgid "Site name"
 msgstr "Naam van deze $Projectname-hub"
 
-#: ../../Zotlabs/Module/Admin.php:473
+#: ../../Zotlabs/Module/Admin.php:501
 msgid "Banner/Logo"
 msgstr "Banner/logo"
 
-#: ../../Zotlabs/Module/Admin.php:474
+#: ../../Zotlabs/Module/Admin.php:502
 msgid "Administrator Information"
 msgstr "Informatie over de beheerder van deze hub"
 
-#: ../../Zotlabs/Module/Admin.php:474
+#: ../../Zotlabs/Module/Admin.php:502
 msgid ""
 "Contact information for site administrators.  Displayed on siteinfo page.  "
 "BBCode can be used here"
 msgstr "Contactinformatie voor hub-beheerders. Getoond op pagina met hub-informatie. Er kan hier bbcode gebruikt worden."
 
-#: ../../Zotlabs/Module/Admin.php:475
+#: ../../Zotlabs/Module/Admin.php:503
 msgid "System language"
 msgstr "Standaardtaal"
 
-#: ../../Zotlabs/Module/Admin.php:476
+#: ../../Zotlabs/Module/Admin.php:504
 msgid "System theme"
 msgstr "Standaardthema"
 
-#: ../../Zotlabs/Module/Admin.php:476
+#: ../../Zotlabs/Module/Admin.php:504
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr "Standaardthema voor $Projectname-hub (kan door lid veranderd worden) - <a href='#' id='cnftheme'>verander thema-instellingen</a>"
 
-#: ../../Zotlabs/Module/Admin.php:477
+#: ../../Zotlabs/Module/Admin.php:505
 msgid "Mobile system theme"
 msgstr "Standaardthema voor mobiel"
 
-#: ../../Zotlabs/Module/Admin.php:477
+#: ../../Zotlabs/Module/Admin.php:505
 msgid "Theme for mobile devices"
 msgstr "Thema voor mobiele apparaten"
 
-#: ../../Zotlabs/Module/Admin.php:479
+#: ../../Zotlabs/Module/Admin.php:507
 msgid "Allow Feeds as Connections"
 msgstr "Sta feeds toe als connecties"
 
-#: ../../Zotlabs/Module/Admin.php:479
+#: ../../Zotlabs/Module/Admin.php:507
 msgid "(Heavy system resource usage)"
 msgstr "(sterk negatieve invloed op systeembronnen hub)"
 
-#: ../../Zotlabs/Module/Admin.php:480
+#: ../../Zotlabs/Module/Admin.php:508
 msgid "Maximum image size"
 msgstr "Maximale grootte van afbeeldingen"
 
-#: ../../Zotlabs/Module/Admin.php:480
+#: ../../Zotlabs/Module/Admin.php:508
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr "Maximale grootte in bytes voor afbeeldingen die worden geüpload. Standaard is 0, wat geen limiet betekend."
 
-#: ../../Zotlabs/Module/Admin.php:481
+#: ../../Zotlabs/Module/Admin.php:509
 msgid "Does this site allow new member registration?"
 msgstr "Staat deze hub nieuwe accounts toe?"
 
-#: ../../Zotlabs/Module/Admin.php:482
+#: ../../Zotlabs/Module/Admin.php:510
 msgid "Invitation only"
 msgstr "Alleen op uitnodiging"
 
-#: ../../Zotlabs/Module/Admin.php:482
+#: ../../Zotlabs/Module/Admin.php:510
 msgid ""
 "Only allow new member registrations with an invitation code. Above register "
 "policy must be set to Yes."
 msgstr "Sta alleen nieuwe registraties toe van mensen die een uitnodigingscode hebben. Bovenstaand accountbeleid moet op Ja staan."
 
-#: ../../Zotlabs/Module/Admin.php:483
+#: ../../Zotlabs/Module/Admin.php:511
 msgid "Which best describes the types of account offered by this hub?"
 msgstr "Wat voor soort accounts biedt deze $Projectname-hub aan? Kies wat het meest in de buurt komt."
 
-#: ../../Zotlabs/Module/Admin.php:484
+#: ../../Zotlabs/Module/Admin.php:512
 msgid "Register text"
 msgstr "Tekst tijdens registratie"
 
-#: ../../Zotlabs/Module/Admin.php:484
+#: ../../Zotlabs/Module/Admin.php:512
 msgid "Will be displayed prominently on the registration page."
 msgstr "Tekst dat op de pagina voor het registreren van nieuwe accounts wordt getoond."
 
-#: ../../Zotlabs/Module/Admin.php:485
+#: ../../Zotlabs/Module/Admin.php:513
 msgid "Site homepage to show visitors (default: login box)"
 msgstr "Homepagina van deze hub die aan bezoekers wordt getoond (standaard: inlogformulier)"
 
-#: ../../Zotlabs/Module/Admin.php:485
+#: ../../Zotlabs/Module/Admin.php:513
 msgid ""
 "example: 'public' to show public stream, 'page/sys/home' to show a system "
 "webpage called 'home' or 'include:home.html' to include a file."
 msgstr "voorbeeld: 'public' om de openbare stream te tonen, 'page/sys/home' om de webpagina 'home' van het systeemkanaal te tonen of 'include:home.html' om een gewoon bestand te gebruiken."
 
-#: ../../Zotlabs/Module/Admin.php:486
+#: ../../Zotlabs/Module/Admin.php:514
 msgid "Preserve site homepage URL"
 msgstr "Behoudt de URL van de hub (/)"
 
-#: ../../Zotlabs/Module/Admin.php:486
+#: ../../Zotlabs/Module/Admin.php:514
 msgid ""
 "Present the site homepage in a frame at the original location instead of "
 "redirecting"
 msgstr "Toon de homepagina van de hub in een frame op de oorspronkelijke locatie (/), i.p.v. een doorverwijzing naar een andere locatie (bv. .../home.html)"
 
-#: ../../Zotlabs/Module/Admin.php:487
+#: ../../Zotlabs/Module/Admin.php:515
 msgid "Accounts abandoned after x days"
 msgstr "Accounts als verlaten beschouwen na zoveel aantal dagen:"
 
-#: ../../Zotlabs/Module/Admin.php:487
+#: ../../Zotlabs/Module/Admin.php:515
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr "Zal geen systeembronnen verspillen door polling van externe hubs voor verlaten accounts. Vul 0 in voor geen tijdslimiet."
 
-#: ../../Zotlabs/Module/Admin.php:488
+#: ../../Zotlabs/Module/Admin.php:516
 msgid "Allowed friend domains"
 msgstr "Toegestane domeinen"
 
-#: ../../Zotlabs/Module/Admin.php:488
+#: ../../Zotlabs/Module/Admin.php:516
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr "Komma-gescheiden lijst van domeinen waarvan kanalen connecties kunnen aangaan met kanalen op deze $Projectname-hub. Wildcards zijn toegestaan.\nLaat leeg om alle domeinen toe te laten."
 
-#: ../../Zotlabs/Module/Admin.php:489
+#: ../../Zotlabs/Module/Admin.php:517
 msgid "Allowed email domains"
 msgstr "Toegestane e-maildomeinen"
 
-#: ../../Zotlabs/Module/Admin.php:489
+#: ../../Zotlabs/Module/Admin.php:517
 msgid ""
 "Comma separated list of domains which are allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains"
 msgstr "Door komma's gescheiden lijst met e-maildomeinen waarvan e-mailadressen op deze hub mogen registeren. Wildcards zijn toegestaan. Laat leeg om alle domeinen toe te laten."
 
-#: ../../Zotlabs/Module/Admin.php:490
+#: ../../Zotlabs/Module/Admin.php:518
 msgid "Not allowed email domains"
 msgstr "Niet toegestane e-maildomeinen"
 
-#: ../../Zotlabs/Module/Admin.php:490
+#: ../../Zotlabs/Module/Admin.php:518
 msgid ""
 "Comma separated list of domains which are not allowed in email addresses for"
 " registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains, unless allowed domains have been defined."
 msgstr "Door komma's gescheiden lijst met e-maildomeinen waarvan e-mailadressen niet op deze hub mogen registeren. Wildcards zijn toegestaan. Laat leeg om alle domeinen toe te staan, tenzij er toegestane domeinen zijn ingesteld. "
 
-#: ../../Zotlabs/Module/Admin.php:491
+#: ../../Zotlabs/Module/Admin.php:519
 msgid "Verify Email Addresses"
 msgstr "E-mailadres verifieren"
 
-#: ../../Zotlabs/Module/Admin.php:491
+#: ../../Zotlabs/Module/Admin.php:519
 msgid ""
 "Check to verify email addresses used in account registration (recommended)."
 msgstr "Inschakelen om e-mailadressen te verifiëren die tijdens de accountregistratie worden gebruikt (aanbevolen)."
 
-#: ../../Zotlabs/Module/Admin.php:492
+#: ../../Zotlabs/Module/Admin.php:520
 msgid "Force publish"
 msgstr "Dwing kanaalvermelding af"
 
-#: ../../Zotlabs/Module/Admin.php:492
+#: ../../Zotlabs/Module/Admin.php:520
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr "Vink dit aan om af te dwingen dat alle kanalen op deze hub in de kanalengids worden vermeld."
 
-#: ../../Zotlabs/Module/Admin.php:493
+#: ../../Zotlabs/Module/Admin.php:521
 msgid "Import Public Streams"
 msgstr "Openbare streams importeren"
 
-#: ../../Zotlabs/Module/Admin.php:493
+#: ../../Zotlabs/Module/Admin.php:521
 msgid ""
 "Import and allow access to public content pulled from other sites. Warning: "
 "this content is unmoderated."
 msgstr "Toegang verlenen tot openbare berichten die vanuit andere hubs worden geïmporteerd. Waarschuwing: de inhoud van deze berichten wordt niet gemodereerd."
 
-#: ../../Zotlabs/Module/Admin.php:494
+#: ../../Zotlabs/Module/Admin.php:522
 msgid "Login on Homepage"
 msgstr "Inlogformulier op de homepagina"
 
-#: ../../Zotlabs/Module/Admin.php:494
+#: ../../Zotlabs/Module/Admin.php:522
 msgid ""
 "Present a login box to visitors on the home page if no other content has "
 "been configured."
 msgstr "Toon een inlogformulier voor bezoekers op de homepagina wanneer geen andere inhoud is geconfigureerd. "
 
-#: ../../Zotlabs/Module/Admin.php:495
+#: ../../Zotlabs/Module/Admin.php:523
 msgid "Enable context help"
 msgstr "Schakel contextuele hulp in"
 
-#: ../../Zotlabs/Module/Admin.php:495
+#: ../../Zotlabs/Module/Admin.php:523
 msgid ""
 "Display contextual help for the current page when the help button is "
 "pressed."
 msgstr "Toon hulp en documentatie voor de op dat moment getoonde pagina, wanneer op de hulp-knop wordt geklikt."
 
-#: ../../Zotlabs/Module/Admin.php:497
+#: ../../Zotlabs/Module/Admin.php:525
 msgid "Directory Server URL"
 msgstr "Server-URL voor de kanalengids"
 
-#: ../../Zotlabs/Module/Admin.php:497
+#: ../../Zotlabs/Module/Admin.php:525
 msgid "Default directory server"
 msgstr "Standaardserver voor de kanalengids"
 
-#: ../../Zotlabs/Module/Admin.php:499
+#: ../../Zotlabs/Module/Admin.php:527
 msgid "Proxy user"
 msgstr "Gebruikersnaam proxy"
 
-#: ../../Zotlabs/Module/Admin.php:500
+#: ../../Zotlabs/Module/Admin.php:528
 msgid "Proxy URL"
 msgstr "Proxy-URL"
 
-#: ../../Zotlabs/Module/Admin.php:501
+#: ../../Zotlabs/Module/Admin.php:529
 msgid "Network timeout"
 msgstr "Netwerktimeout"
 
-#: ../../Zotlabs/Module/Admin.php:501
+#: ../../Zotlabs/Module/Admin.php:529
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr "Waarde is in seconden. Zet op 0 voor onbeperkt (niet aanbevolen)"
 
-#: ../../Zotlabs/Module/Admin.php:502
+#: ../../Zotlabs/Module/Admin.php:530
 msgid "Delivery interval"
 msgstr "Afleveringsinterval"
 
-#: ../../Zotlabs/Module/Admin.php:502
+#: ../../Zotlabs/Module/Admin.php:530
 msgid ""
 "Delay background delivery processes by this many seconds to reduce system "
 "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
 "for large dedicated servers."
 msgstr "Vertraag de achtergrondprocessen voor het afleveren met een aantal seconden om de systeembelasting te verminderen. Aanbevolen: 4-5 voor shared hosts, 2-3 voor virtual private servers (VPS) en 0-1 voor grote dedicated servers."
 
-#: ../../Zotlabs/Module/Admin.php:503
+#: ../../Zotlabs/Module/Admin.php:531
 msgid "Deliveries per process"
 msgstr "Leveringen per serverproces"
 
-#: ../../Zotlabs/Module/Admin.php:503
+#: ../../Zotlabs/Module/Admin.php:531
 msgid ""
 "Number of deliveries to attempt in a single operating system process. Adjust"
 " if necessary to tune system performance. Recommend: 1-5."
 msgstr "Aantal leveringen die aan één serverproces worden meegegeven. Pas dit aan wanneer het nodig is om systeemprestaties te verbeteren. Aangeraden: 1-5"
 
-#: ../../Zotlabs/Module/Admin.php:504
+#: ../../Zotlabs/Module/Admin.php:532
 msgid "Poll interval"
 msgstr "Poll-interval"
 
-#: ../../Zotlabs/Module/Admin.php:504
+#: ../../Zotlabs/Module/Admin.php:532
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr "De achtergrondprocessen voor het afleveren met zoveel seconden vertragen om de systeembelasting te verminderen. 0 om de afleveringsinterval te gebruiken."
 
-#: ../../Zotlabs/Module/Admin.php:505
+#: ../../Zotlabs/Module/Admin.php:533
 msgid "Maximum Load Average"
 msgstr "Maximaal gemiddelde systeembelasting"
 
-#: ../../Zotlabs/Module/Admin.php:505
+#: ../../Zotlabs/Module/Admin.php:533
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr "Maximale systeembelasting voordat de afleverings- en polllingsprocessen worden uitgesteld. Standaard is 50."
 
-#: ../../Zotlabs/Module/Admin.php:506
+#: ../../Zotlabs/Module/Admin.php:534
 msgid "Expiration period in days for imported (grid/network) content"
 msgstr "Aantal dagen waarna geïmporteerde inhoud uit iemands grid/netwerk-pagina wordt verwijderd."
 
-#: ../../Zotlabs/Module/Admin.php:506
+#: ../../Zotlabs/Module/Admin.php:534
 msgid "0 for no expiration of imported content"
 msgstr "Dit geldt alleen voor inhoud van andere kanalen, dus niet voor iemands eigen kanaal. 0 voor het niet verwijderen van geïmporteerde inhoud."
 
-#: ../../Zotlabs/Module/Admin.php:643 ../../Zotlabs/Module/Admin.php:644
-#: ../../Zotlabs/Module/Settings.php:720
+#: ../../Zotlabs/Module/Admin.php:677 ../../Zotlabs/Module/Admin.php:678
+#: ../../Zotlabs/Module/Settings.php:722
 msgid "Off"
 msgstr "Uit"
 
-#: ../../Zotlabs/Module/Admin.php:643 ../../Zotlabs/Module/Admin.php:644
-#: ../../Zotlabs/Module/Settings.php:720
+#: ../../Zotlabs/Module/Admin.php:677 ../../Zotlabs/Module/Admin.php:678
+#: ../../Zotlabs/Module/Settings.php:722
 msgid "On"
 msgstr "Aan"
 
-#: ../../Zotlabs/Module/Admin.php:644
+#: ../../Zotlabs/Module/Admin.php:678
 #, php-format
 msgid "Lock feature %s"
 msgstr "   Vergrendel de functie '%s'"
 
-#: ../../Zotlabs/Module/Admin.php:652
+#: ../../Zotlabs/Module/Admin.php:686
 msgid "Manage Additional Features"
 msgstr "Beheer - Extra functies"
 
-#: ../../Zotlabs/Module/Admin.php:669
+#: ../../Zotlabs/Module/Admin.php:703
 msgid "No server found"
 msgstr "Geen hub gevonden"
 
-#: ../../Zotlabs/Module/Admin.php:676 ../../Zotlabs/Module/Admin.php:1006
+#: ../../Zotlabs/Module/Admin.php:710 ../../Zotlabs/Module/Admin.php:1048
 msgid "ID"
 msgstr "ID"
 
-#: ../../Zotlabs/Module/Admin.php:676
+#: ../../Zotlabs/Module/Admin.php:710
 msgid "for channel"
 msgstr "voor kanaal"
 
-#: ../../Zotlabs/Module/Admin.php:676
+#: ../../Zotlabs/Module/Admin.php:710
 msgid "on server"
 msgstr "op hub"
 
-#: ../../Zotlabs/Module/Admin.php:676 ../../Zotlabs/Module/Connections.php:270
+#: ../../Zotlabs/Module/Admin.php:710 ../../Zotlabs/Module/Connections.php:270
 msgid "Status"
 msgstr "Status"
 
-#: ../../Zotlabs/Module/Admin.php:678
+#: ../../Zotlabs/Module/Admin.php:712
 msgid "Server"
 msgstr "Hubbeheer"
 
-#: ../../Zotlabs/Module/Admin.php:718 ../../include/widgets.php:1337
+#: ../../Zotlabs/Module/Admin.php:746
+msgid ""
+"By default, unfiltered HTML is allowed in embedded media. This is inherently"
+" insecure."
+msgstr "Standaard is ongefilterde HTML in ingesloten (embedded) media toegestaan. Dit is inherent onveilig."
+
+#: ../../Zotlabs/Module/Admin.php:749
+msgid ""
+"The recommended setting is to only allow unfiltered HTML from the following "
+"sites:"
+msgstr "Het wordt aanbevolen om alleen ongefilterde HTML van de volgende websites toe te staan:"
+
+#: ../../Zotlabs/Module/Admin.php:750
+msgid ""
+"https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/<br"
+" />https://vimeo.com/<br />https://soundcloud.com/<br />"
+msgstr "https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/<br />https://vimeo.com/<br />https://soundcloud.com/<br />"
+
+#: ../../Zotlabs/Module/Admin.php:751
+msgid ""
+"All other embedded content will be filtered, <strong>unless</strong> "
+"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
 msgid "Security"
 msgstr "Beveiliging"
 
-#: ../../Zotlabs/Module/Admin.php:720
+#: ../../Zotlabs/Module/Admin.php:758
 msgid "Block public"
 msgstr "Openbare toegang blokkeren"
 
-#: ../../Zotlabs/Module/Admin.php:720
+#: ../../Zotlabs/Module/Admin.php:758
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently authenticated."
 msgstr "Vink dit aan om alle normaliter openbare persoonlijke pagina's op deze hub alleen toegankelijk te maken voor leden die zich hebben geauthenticeerd."
 
-#: ../../Zotlabs/Module/Admin.php:721
+#: ../../Zotlabs/Module/Admin.php:759
+msgid "Set \"Transport Security\" HTTP header"
+msgstr "\"Transport Security\" HTTP-header inschakelen"
+
+#: ../../Zotlabs/Module/Admin.php:760
+msgid "Set \"Content Security Policy\" HTTP header"
+msgstr " \"Content Security Policy\" HTTP-header inschakelen"
+
+#: ../../Zotlabs/Module/Admin.php:761
 msgid "Allow communications only from these sites"
 msgstr "Alleen communicatie met deze hubs toestaan"
 
-#: ../../Zotlabs/Module/Admin.php:721
+#: ../../Zotlabs/Module/Admin.php:761
 msgid ""
 "One site per line. Leave empty to allow communication from anywhere by "
 "default"
 msgstr "Eén hub per regel. Laat leeg om communicatie standaard met alle hubs toe te staan"
 
-#: ../../Zotlabs/Module/Admin.php:722
+#: ../../Zotlabs/Module/Admin.php:762
 msgid "Block communications from these sites"
 msgstr "Communicatie met deze hubs blokkeren"
 
-#: ../../Zotlabs/Module/Admin.php:723
+#: ../../Zotlabs/Module/Admin.php:763
 msgid "Allow communications only from these channels"
 msgstr "Sta alleen communicatie toe met deze kanalen"
 
-#: ../../Zotlabs/Module/Admin.php:723
+#: ../../Zotlabs/Module/Admin.php:763
 msgid ""
 "One channel (hash) per line. Leave empty to allow from any channel by "
 "default"
 msgstr "Eén kanaal (hash) per regel. Laat leeg om communicatie standaard met alle kanalen toe te staan"
 
-#: ../../Zotlabs/Module/Admin.php:724
+#: ../../Zotlabs/Module/Admin.php:764
 msgid "Block communications from these channels"
 msgstr "Communicatie met deze kanalen blokkeren"
 
-#: ../../Zotlabs/Module/Admin.php:725
-msgid "Allow embedded HTML content only from these domains"
-msgstr "Alleen ingesloten (embedded) HTML vanaf deze domeinen toestaan"
+#: ../../Zotlabs/Module/Admin.php:765
+msgid "Only allow embeds from secure (SSL) websites and links."
+msgstr "Alleen ingesloten (embedded) inhoud van veilige (SSL) websites en links toestaan."
 
-#: ../../Zotlabs/Module/Admin.php:725
-msgid "One site per line. Leave empty to allow from any site by default"
-msgstr "Eén per regel. Laat leeg om standaard vanaf elk domein toe te staan"
+#: ../../Zotlabs/Module/Admin.php:766
+msgid "Allow unfiltered embedded HTML content only from these domains"
+msgstr "Alleen ongefilterde ingesloten (embedded) HTML van deze websites toestaan"
 
-#: ../../Zotlabs/Module/Admin.php:726
+#: ../../Zotlabs/Module/Admin.php:766
+msgid "One site per line. By default embedded content is filtered."
+msgstr "Eén website per regel. Standaard wordt ingesloten (embedded) inhoud gefilterd."
+
+#: ../../Zotlabs/Module/Admin.php:767
 msgid "Block embedded HTML from these domains"
 msgstr "Ingesloten (embedded) HTML vanaf deze domeinen blokkeren"
 
-#: ../../Zotlabs/Module/Admin.php:743
+#: ../../Zotlabs/Module/Admin.php:785
 msgid "Update has been marked successful"
 msgstr "Update is als succesvol gemarkeerd"
 
-#: ../../Zotlabs/Module/Admin.php:753
+#: ../../Zotlabs/Module/Admin.php:795
 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr "Uitvoeren van %s is mislukt. Controleer systeemlogboek."
 
-#: ../../Zotlabs/Module/Admin.php:756
+#: ../../Zotlabs/Module/Admin.php:798
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr "Update %s was geslaagd."
 
-#: ../../Zotlabs/Module/Admin.php:760
+#: ../../Zotlabs/Module/Admin.php:802
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr "Update %s gaf geen melding. Het is daarom niet bekend of deze geslaagd is."
 
-#: ../../Zotlabs/Module/Admin.php:763
+#: ../../Zotlabs/Module/Admin.php:805
 #, php-format
 msgid "Update function %s could not be found."
 msgstr "Update-functie %s kon niet gevonden worden."
 
-#: ../../Zotlabs/Module/Admin.php:779
+#: ../../Zotlabs/Module/Admin.php:821
 msgid "No failed updates."
 msgstr "Geen mislukte updates."
 
-#: ../../Zotlabs/Module/Admin.php:783
+#: ../../Zotlabs/Module/Admin.php:825
 msgid "Failed Updates"
 msgstr "Mislukte updates"
 
-#: ../../Zotlabs/Module/Admin.php:785
+#: ../../Zotlabs/Module/Admin.php:827
 msgid "Mark success (if update was manually applied)"
 msgstr "Markeer als geslaagd (wanneer de update handmatig was uitgevoerd)"
 
-#: ../../Zotlabs/Module/Admin.php:786
+#: ../../Zotlabs/Module/Admin.php:828
 msgid "Attempt to execute this update step automatically"
 msgstr "Poging om deze stap van de update automatisch uit te voeren."
 
-#: ../../Zotlabs/Module/Admin.php:817
+#: ../../Zotlabs/Module/Admin.php:859
 msgid "Queue Statistics"
 msgstr "Wachtrij-statistieken"
 
-#: ../../Zotlabs/Module/Admin.php:818
+#: ../../Zotlabs/Module/Admin.php:860
 msgid "Total Entries"
 msgstr "Aantal vermeldingen"
 
-#: ../../Zotlabs/Module/Admin.php:819
+#: ../../Zotlabs/Module/Admin.php:861
 msgid "Priority"
 msgstr "Prioriteit"
 
-#: ../../Zotlabs/Module/Admin.php:820
+#: ../../Zotlabs/Module/Admin.php:862
 msgid "Destination URL"
 msgstr "Doel-URL"
 
-#: ../../Zotlabs/Module/Admin.php:821
+#: ../../Zotlabs/Module/Admin.php:863
 msgid "Mark hub permanently offline"
 msgstr "Hub als permanent offline markeren"
 
-#: ../../Zotlabs/Module/Admin.php:822
+#: ../../Zotlabs/Module/Admin.php:864
 msgid "Empty queue for this hub"
 msgstr "Berichtenwachtrij voor deze hub legen"
 
-#: ../../Zotlabs/Module/Admin.php:823
+#: ../../Zotlabs/Module/Admin.php:865
 msgid "Last known contact"
 msgstr "Voor het laatst contact"
 
-#: ../../Zotlabs/Module/Admin.php:859
+#: ../../Zotlabs/Module/Admin.php:901
 #, php-format
 msgid "%s account blocked/unblocked"
 msgid_plural "%s account blocked/unblocked"
 msgstr[0] "%s account geblokkeerd/gedeblokkeerd"
 msgstr[1] "%s accounts geblokkeerd/gedeblokkeerd"
 
-#: ../../Zotlabs/Module/Admin.php:867
+#: ../../Zotlabs/Module/Admin.php:909
 #, 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:903
+#: ../../Zotlabs/Module/Admin.php:945
 msgid "Account not found"
 msgstr "Account niet gevonden"
 
-#: ../../Zotlabs/Module/Admin.php:915
+#: ../../Zotlabs/Module/Admin.php:957
 #, php-format
 msgid "Account '%s' deleted"
 msgstr "Account '%s' verwijderd"
 
-#: ../../Zotlabs/Module/Admin.php:923
+#: ../../Zotlabs/Module/Admin.php:965
 #, php-format
 msgid "Account '%s' blocked"
 msgstr "Account '%s' geblokkeerd"
 
-#: ../../Zotlabs/Module/Admin.php:931
+#: ../../Zotlabs/Module/Admin.php:973
 #, php-format
 msgid "Account '%s' unblocked"
 msgstr "Account '%s' gedeblokkeerd"
 
-#: ../../Zotlabs/Module/Admin.php:993 ../../Zotlabs/Module/Admin.php:1005
+#: ../../Zotlabs/Module/Admin.php:1035 ../../Zotlabs/Module/Admin.php:1047
 msgid "Users"
 msgstr "Accounts"
 
-#: ../../Zotlabs/Module/Admin.php:995 ../../Zotlabs/Module/Admin.php:1159
+#: ../../Zotlabs/Module/Admin.php:1037 ../../Zotlabs/Module/Admin.php:1201
 msgid "select all"
 msgstr "alles selecteren"
 
-#: ../../Zotlabs/Module/Admin.php:996
+#: ../../Zotlabs/Module/Admin.php:1038
 msgid "User registrations waiting for confirm"
 msgstr "Accounts die op goedkeuring wachten"
 
-#: ../../Zotlabs/Module/Admin.php:997
+#: ../../Zotlabs/Module/Admin.php:1039
 msgid "Request date"
 msgstr "Tijd/datum verzoek"
 
-#: ../../Zotlabs/Module/Admin.php:997 ../../Zotlabs/Module/Admin.php:1006
+#: ../../Zotlabs/Module/Admin.php:1039 ../../Zotlabs/Module/Admin.php:1048
 #: ../../Zotlabs/Module/Id.php:17 ../../Zotlabs/Module/Id.php:18
 #: ../../include/contact_selectors.php:81 ../../boot.php:1617
 msgid "Email"
 msgstr "E-mail"
 
-#: ../../Zotlabs/Module/Admin.php:998
+#: ../../Zotlabs/Module/Admin.php:1040
 msgid "No registrations."
 msgstr "Geen verzoeken."
 
-#: ../../Zotlabs/Module/Admin.php:999 ../../Zotlabs/Module/Connections.php:275
+#: ../../Zotlabs/Module/Admin.php:1041
+#: ../../Zotlabs/Module/Connections.php:275
 msgid "Approve"
 msgstr "Goedkeuren"
 
-#: ../../Zotlabs/Module/Admin.php:1000
+#: ../../Zotlabs/Module/Admin.php:1042
 msgid "Deny"
 msgstr "Afkeuren"
 
-#: ../../Zotlabs/Module/Admin.php:1002 ../../Zotlabs/Module/Connedit.php:541
+#: ../../Zotlabs/Module/Admin.php:1044 ../../Zotlabs/Module/Connedit.php:541
 msgid "Block"
 msgstr "Blokkeren"
 
-#: ../../Zotlabs/Module/Admin.php:1003 ../../Zotlabs/Module/Connedit.php:541
+#: ../../Zotlabs/Module/Admin.php:1045 ../../Zotlabs/Module/Connedit.php:541
 msgid "Unblock"
 msgstr "Deblokkeren"
 
-#: ../../Zotlabs/Module/Admin.php:1006 ../../include/group.php:267
+#: ../../Zotlabs/Module/Admin.php:1048 ../../include/group.php:267
 msgid "All Channels"
 msgstr "Alle kanalen"
 
-#: ../../Zotlabs/Module/Admin.php:1006
+#: ../../Zotlabs/Module/Admin.php:1048
 msgid "Register date"
 msgstr "Geregistreerd"
 
-#: ../../Zotlabs/Module/Admin.php:1006
+#: ../../Zotlabs/Module/Admin.php:1048
 msgid "Last login"
 msgstr "Laatste keer ingelogd"
 
-#: ../../Zotlabs/Module/Admin.php:1006
+#: ../../Zotlabs/Module/Admin.php:1048
 msgid "Expires"
 msgstr "Verloopt"
 
-#: ../../Zotlabs/Module/Admin.php:1006
+#: ../../Zotlabs/Module/Admin.php:1048
 msgid "Service Class"
 msgstr "Abonnementen"
 
-#: ../../Zotlabs/Module/Admin.php:1008
+#: ../../Zotlabs/Module/Admin.php:1050
 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:1009
+#: ../../Zotlabs/Module/Admin.php:1051
 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:1045
+#: ../../Zotlabs/Module/Admin.php:1087
 #, 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:1054
+#: ../../Zotlabs/Module/Admin.php:1096
 #, 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:1061
+#: ../../Zotlabs/Module/Admin.php:1103
 #, 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:1081
+#: ../../Zotlabs/Module/Admin.php:1123
 msgid "Channel not found"
 msgstr "Kanaal niet gevonden"
 
-#: ../../Zotlabs/Module/Admin.php:1092
+#: ../../Zotlabs/Module/Admin.php:1134
 #, php-format
 msgid "Channel '%s' deleted"
 msgstr "Kanaal '%s' verwijderd"
 
-#: ../../Zotlabs/Module/Admin.php:1104
+#: ../../Zotlabs/Module/Admin.php:1146
 #, php-format
 msgid "Channel '%s' censored"
 msgstr "Kanaal '%s' gecensureerd"
 
-#: ../../Zotlabs/Module/Admin.php:1104
+#: ../../Zotlabs/Module/Admin.php:1146
 #, php-format
 msgid "Channel '%s' uncensored"
 msgstr "Kanaal '%s' ongecensureerd"
 
-#: ../../Zotlabs/Module/Admin.php:1115
+#: ../../Zotlabs/Module/Admin.php:1157
 #, php-format
 msgid "Channel '%s' code allowed"
 msgstr "Scripts toegestaan voor kanaal '%s'"
 
-#: ../../Zotlabs/Module/Admin.php:1115
+#: ../../Zotlabs/Module/Admin.php:1157
 #, php-format
 msgid "Channel '%s' code disallowed"
 msgstr "Scripts niet toegestaan voor kanaal '%s'"
 
-#: ../../Zotlabs/Module/Admin.php:1157 ../../include/widgets.php:1336
+#: ../../Zotlabs/Module/Admin.php:1199 ../../include/widgets.php:1385
 msgid "Channels"
 msgstr "Kanalen"
 
-#: ../../Zotlabs/Module/Admin.php:1161
+#: ../../Zotlabs/Module/Admin.php:1203
 msgid "Censor"
 msgstr "Censureren"
 
-#: ../../Zotlabs/Module/Admin.php:1162
+#: ../../Zotlabs/Module/Admin.php:1204
 msgid "Uncensor"
 msgstr "Niet censureren"
 
-#: ../../Zotlabs/Module/Admin.php:1163
+#: ../../Zotlabs/Module/Admin.php:1205
 msgid "Allow Code"
 msgstr "Scripts toestaan"
 
-#: ../../Zotlabs/Module/Admin.php:1164
+#: ../../Zotlabs/Module/Admin.php:1206
 msgid "Disallow Code"
 msgstr "Scripts niet toestaan"
 
-#: ../../Zotlabs/Module/Admin.php:1165 ../../include/conversation.php:1629
+#: ../../Zotlabs/Module/Admin.php:1207 ../../include/conversation.php:1617
 msgid "Channel"
 msgstr "Kanaal"
 
-#: ../../Zotlabs/Module/Admin.php:1166
+#: ../../Zotlabs/Module/Admin.php:1208
 msgid "UID"
 msgstr "UID"
 
-#: ../../Zotlabs/Module/Admin.php:1166 ../../Zotlabs/Module/Locs.php:118
+#: ../../Zotlabs/Module/Admin.php:1208 ../../Zotlabs/Module/Locs.php:118
 #: ../../Zotlabs/Module/Profiles.php:469
 msgid "Address"
 msgstr "Kanaaladres"
 
-#: ../../Zotlabs/Module/Admin.php:1168
+#: ../../Zotlabs/Module/Admin.php:1210
 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:1169
+#: ../../Zotlabs/Module/Admin.php:1211
 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:1226
+#: ../../Zotlabs/Module/Admin.php:1268
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "Plugin %s uitgeschakeld."
 
-#: ../../Zotlabs/Module/Admin.php:1230
+#: ../../Zotlabs/Module/Admin.php:1272
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "Plugin %s ingeschakeld"
 
-#: ../../Zotlabs/Module/Admin.php:1240 ../../Zotlabs/Module/Admin.php:1466
+#: ../../Zotlabs/Module/Admin.php:1282 ../../Zotlabs/Module/Admin.php:1565
 msgid "Disable"
 msgstr "Uitschakelen"
 
-#: ../../Zotlabs/Module/Admin.php:1243 ../../Zotlabs/Module/Admin.php:1468
+#: ../../Zotlabs/Module/Admin.php:1285 ../../Zotlabs/Module/Admin.php:1567
 msgid "Enable"
 msgstr "Inschakelen"
 
-#: ../../Zotlabs/Module/Admin.php:1272 ../../Zotlabs/Module/Admin.php:1333
-#: ../../include/widgets.php:1339
+#: ../../Zotlabs/Module/Admin.php:1314 ../../Zotlabs/Module/Admin.php:1404
+#: ../../include/widgets.php:1388
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../../Zotlabs/Module/Admin.php:1273 ../../Zotlabs/Module/Admin.php:1495
+#: ../../Zotlabs/Module/Admin.php:1315 ../../Zotlabs/Module/Admin.php:1594
 msgid "Toggle"
 msgstr "Omschakelen"
 
-#: ../../Zotlabs/Module/Admin.php:1274 ../../Zotlabs/Module/Admin.php:1496
-#: ../../include/apps.php:134 ../../include/widgets.php:589
-#: ../../include/nav.php:208
+#: ../../Zotlabs/Module/Admin.php:1316 ../../Zotlabs/Module/Admin.php:1595
+#: ../../include/widgets.php:638 ../../include/nav.php:208
+#: ../../include/apps.php:166
 msgid "Settings"
 msgstr "Instellingen"
 
-#: ../../Zotlabs/Module/Admin.php:1281 ../../Zotlabs/Module/Admin.php:1505
+#: ../../Zotlabs/Module/Admin.php:1323 ../../Zotlabs/Module/Admin.php:1604
 msgid "Author: "
 msgstr "Auteur: "
 
-#: ../../Zotlabs/Module/Admin.php:1282 ../../Zotlabs/Module/Admin.php:1506
+#: ../../Zotlabs/Module/Admin.php:1324 ../../Zotlabs/Module/Admin.php:1605
 msgid "Maintainer: "
 msgstr "Beheerder: "
 
-#: ../../Zotlabs/Module/Admin.php:1283
+#: ../../Zotlabs/Module/Admin.php:1325
 msgid "Minimum project version: "
 msgstr "Minimum versie Hubzilla: "
 
-#: ../../Zotlabs/Module/Admin.php:1284
+#: ../../Zotlabs/Module/Admin.php:1326
 msgid "Maximum project version: "
 msgstr "Maximum versie Hubzilla:"
 
-#: ../../Zotlabs/Module/Admin.php:1285
+#: ../../Zotlabs/Module/Admin.php:1327
 msgid "Minimum PHP version: "
 msgstr "Minimum versie PHP: "
 
-#: ../../Zotlabs/Module/Admin.php:1286
+#: ../../Zotlabs/Module/Admin.php:1328
 msgid "Requires: "
 msgstr "Vereist: "
 
-#: ../../Zotlabs/Module/Admin.php:1287 ../../Zotlabs/Module/Admin.php:1338
+#: ../../Zotlabs/Module/Admin.php:1329 ../../Zotlabs/Module/Admin.php:1409
 msgid "Disabled - version incompatibility"
 msgstr "Uitgeschakeld - versie is incompatibel"
 
-#: ../../Zotlabs/Module/Admin.php:1431
+#: ../../Zotlabs/Module/Admin.php:1378
+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
+msgid "Plugin repo git URL"
+msgstr "Git-URL plugin-repository"
+
+#: ../../Zotlabs/Module/Admin.php:1380
+msgid "Custom repo name"
+msgstr "Handmatige repository-naam"
+
+#: ../../Zotlabs/Module/Admin.php:1380
+msgid "(optional)"
+msgstr "(optioneel)"
+
+#: ../../Zotlabs/Module/Admin.php:1381
+msgid "Download Plugin Repo"
+msgstr "Plugin-repository downloaden"
+
+#: ../../Zotlabs/Module/Admin.php:1388
+msgid "Install new repo"
+msgstr "Nieuwe repository installeren"
+
+#: ../../Zotlabs/Module/Admin.php:1389 ../../include/apps.php:284
+msgid "Install"
+msgstr "Installeren"
+
+#: ../../Zotlabs/Module/Admin.php:1390 ../../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
+msgid "Cancel"
+msgstr "Annuleren"
+
+#: ../../Zotlabs/Module/Admin.php:1411
+msgid "Add Plugin Repo"
+msgstr "Plugin-repository toevoegen"
+
+#: ../../Zotlabs/Module/Admin.php:1417 ../../Zotlabs/Module/Settings.php:77
+#: ../../Zotlabs/Module/Settings.php:616 ../../include/apps.php:284
+msgid "Update"
+msgstr "Bijwerken"
+
+#: ../../Zotlabs/Module/Admin.php:1418
+msgid "Switch branch"
+msgstr "Branch veranderen"
+
+#: ../../Zotlabs/Module/Admin.php:1419 ../../Zotlabs/Module/Photos.php:998
+#: ../../Zotlabs/Module/Tagrm.php:137
+msgid "Remove"
+msgstr "Verwijderen"
+
+#: ../../Zotlabs/Module/Admin.php:1530
 msgid "No themes found."
 msgstr "Geen thema's gevonden"
 
-#: ../../Zotlabs/Module/Admin.php:1487
+#: ../../Zotlabs/Module/Admin.php:1586
 msgid "Screenshot"
 msgstr "Schermafdruk"
 
-#: ../../Zotlabs/Module/Admin.php:1494 ../../Zotlabs/Module/Admin.php:1528
-#: ../../include/widgets.php:1340
+#: ../../Zotlabs/Module/Admin.php:1593 ../../Zotlabs/Module/Admin.php:1627
+#: ../../include/widgets.php:1389
 msgid "Themes"
 msgstr "Thema's"
 
-#: ../../Zotlabs/Module/Admin.php:1533
+#: ../../Zotlabs/Module/Admin.php:1632
 msgid "[Experimental]"
 msgstr "[Experimenteel]"
 
-#: ../../Zotlabs/Module/Admin.php:1534
+#: ../../Zotlabs/Module/Admin.php:1633
 msgid "[Unsupported]"
 msgstr "[Niet ondersteund]"
 
-#: ../../Zotlabs/Module/Admin.php:1558
+#: ../../Zotlabs/Module/Admin.php:1657
 msgid "Log settings updated."
 msgstr "Logboek-instellingen bijgewerkt."
 
-#: ../../Zotlabs/Module/Admin.php:1613 ../../include/widgets.php:1361
-#: ../../include/widgets.php:1371
+#: ../../Zotlabs/Module/Admin.php:1712 ../../include/widgets.php:1410
+#: ../../include/widgets.php:1420
 msgid "Logs"
 msgstr "Logboeken"
 
-#: ../../Zotlabs/Module/Admin.php:1615
+#: ../../Zotlabs/Module/Admin.php:1714
 msgid "Clear"
 msgstr "Leegmaken"
 
-#: ../../Zotlabs/Module/Admin.php:1621
+#: ../../Zotlabs/Module/Admin.php:1720
 msgid "Debugging"
 msgstr "Debuggen"
 
-#: ../../Zotlabs/Module/Admin.php:1622
+#: ../../Zotlabs/Module/Admin.php:1721
 msgid "Log file"
 msgstr "Logbestand"
 
-#: ../../Zotlabs/Module/Admin.php:1622
+#: ../../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:1623
+#: ../../Zotlabs/Module/Admin.php:1722
 msgid "Log level"
 msgstr "Logniveau"
 
-#: ../../Zotlabs/Module/Admin.php:1690
+#: ../../Zotlabs/Module/Admin.php:1990
 msgid "New Profile Field"
 msgstr "Nieuw profielveld"
 
-#: ../../Zotlabs/Module/Admin.php:1691 ../../Zotlabs/Module/Admin.php:1711
+#: ../../Zotlabs/Module/Admin.php:1991 ../../Zotlabs/Module/Admin.php:2011
 msgid "Field nickname"
 msgstr "Bijnaam voor veld"
 
-#: ../../Zotlabs/Module/Admin.php:1691 ../../Zotlabs/Module/Admin.php:1711
+#: ../../Zotlabs/Module/Admin.php:1991 ../../Zotlabs/Module/Admin.php:2011
 msgid "System name of field"
 msgstr "Systeemnaam voor veld"
 
-#: ../../Zotlabs/Module/Admin.php:1692 ../../Zotlabs/Module/Admin.php:1712
+#: ../../Zotlabs/Module/Admin.php:1992 ../../Zotlabs/Module/Admin.php:2012
 msgid "Input type"
 msgstr "Invoertype"
 
-#: ../../Zotlabs/Module/Admin.php:1693 ../../Zotlabs/Module/Admin.php:1713
+#: ../../Zotlabs/Module/Admin.php:1993 ../../Zotlabs/Module/Admin.php:2013
 msgid "Field Name"
 msgstr "Veldnaam"
 
-#: ../../Zotlabs/Module/Admin.php:1693 ../../Zotlabs/Module/Admin.php:1713
+#: ../../Zotlabs/Module/Admin.php:1993 ../../Zotlabs/Module/Admin.php:2013
 msgid "Label on profile pages"
 msgstr "Tekstlabel voor op profielpagina's"
 
-#: ../../Zotlabs/Module/Admin.php:1694 ../../Zotlabs/Module/Admin.php:1714
+#: ../../Zotlabs/Module/Admin.php:1994 ../../Zotlabs/Module/Admin.php:2014
 msgid "Help text"
 msgstr "Helptekst"
 
-#: ../../Zotlabs/Module/Admin.php:1694 ../../Zotlabs/Module/Admin.php:1714
+#: ../../Zotlabs/Module/Admin.php:1994 ../../Zotlabs/Module/Admin.php:2014
 msgid "Additional info (optional)"
 msgstr "Extra informatie (optioneel)"
 
-#: ../../Zotlabs/Module/Admin.php:1695 ../../Zotlabs/Module/Admin.php:1715
+#: ../../Zotlabs/Module/Admin.php:1995 ../../Zotlabs/Module/Admin.php:2015
 #: ../../Zotlabs/Module/Filer.php:53 ../../Zotlabs/Module/Rbmark.php:32
-#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/text.php:905
-#: ../../include/text.php:917 ../../include/widgets.php:201
+#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/widgets.php:201
+#: ../../include/text.php:934 ../../include/text.php:946
 msgid "Save"
 msgstr "Opslaan"
 
-#: ../../Zotlabs/Module/Admin.php:1704
+#: ../../Zotlabs/Module/Admin.php:2004
 msgid "Field definition not found"
 msgstr "Velddefinitie niet gevonden"
 
-#: ../../Zotlabs/Module/Admin.php:1710
+#: ../../Zotlabs/Module/Admin.php:2010
 msgid "Edit Profile Field"
 msgstr "Profielveld bewerken"
 
-#: ../../Zotlabs/Module/Admin.php:1768 ../../include/widgets.php:1342
+#: ../../Zotlabs/Module/Admin.php:2068 ../../include/widgets.php:1391
 msgid "Profile Fields"
 msgstr "Profielvelden"
 
-#: ../../Zotlabs/Module/Admin.php:1769
+#: ../../Zotlabs/Module/Admin.php:2069
 msgid "Basic Profile Fields"
 msgstr "Standaard profielvelden"
 
-#: ../../Zotlabs/Module/Admin.php:1770
+#: ../../Zotlabs/Module/Admin.php:2070
 msgid "Advanced Profile Fields"
 msgstr "Geavanceerde profielvelden"
 
-#: ../../Zotlabs/Module/Admin.php:1770
+#: ../../Zotlabs/Module/Admin.php:2070
 msgid "(In addition to basic fields)"
 msgstr "(als toevoeging op de standaard velden)"
 
-#: ../../Zotlabs/Module/Admin.php:1772
+#: ../../Zotlabs/Module/Admin.php:2072
 msgid "All available fields"
 msgstr "Alle beschikbare velden"
 
-#: ../../Zotlabs/Module/Admin.php:1773
+#: ../../Zotlabs/Module/Admin.php:2073
 msgid "Custom Fields"
 msgstr "Extra (handmatig toegevoegde) velden"
 
-#: ../../Zotlabs/Module/Admin.php:1777
+#: ../../Zotlabs/Module/Admin.php:2077
 msgid "Create Custom Field"
 msgstr "Extra velden aanmaken"
 
@@ -1305,67 +1407,71 @@ 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:32 ../../Zotlabs/Module/Appman.php:48
+#: ../../Zotlabs/Module/Appman.php:36 ../../Zotlabs/Module/Appman.php:52
 msgid "App installed."
 msgstr "App geïnstalleerd"
 
-#: ../../Zotlabs/Module/Appman.php:41
+#: ../../Zotlabs/Module/Appman.php:45
 msgid "Malformed app."
 msgstr "Misvormde app."
 
-#: ../../Zotlabs/Module/Appman.php:84
+#: ../../Zotlabs/Module/Appman.php:103
 msgid "Embed code"
 msgstr "Insluitcode"
 
-#: ../../Zotlabs/Module/Appman.php:90
+#: ../../Zotlabs/Module/Appman.php:109 ../../include/widgets.php:107
 msgid "Edit App"
 msgstr "App bewerken"
 
-#: ../../Zotlabs/Module/Appman.php:90
+#: ../../Zotlabs/Module/Appman.php:109
 msgid "Create App"
 msgstr "App maken"
 
-#: ../../Zotlabs/Module/Appman.php:95
+#: ../../Zotlabs/Module/Appman.php:114
 msgid "Name of app"
 msgstr "Naam van app"
 
-#: ../../Zotlabs/Module/Appman.php:95 ../../Zotlabs/Module/Appman.php:96
-#: ../../Zotlabs/Module/Events.php:448 ../../Zotlabs/Module/Events.php:453
+#: ../../Zotlabs/Module/Appman.php:114 ../../Zotlabs/Module/Appman.php:115
+#: ../../Zotlabs/Module/Events.php:449 ../../Zotlabs/Module/Events.php:454
 #: ../../Zotlabs/Module/Profiles.php:713 ../../Zotlabs/Module/Profiles.php:717
 #: ../../include/datetime.php:246
 msgid "Required"
 msgstr "Vereist"
 
-#: ../../Zotlabs/Module/Appman.php:96
+#: ../../Zotlabs/Module/Appman.php:115
 msgid "Location (URL) of app"
 msgstr "Locatie (URL) van app"
 
-#: ../../Zotlabs/Module/Appman.php:97 ../../Zotlabs/Module/Events.php:461
+#: ../../Zotlabs/Module/Appman.php:116 ../../Zotlabs/Module/Events.php:462
 #: ../../Zotlabs/Module/Rbmark.php:101
 msgid "Description"
 msgstr "Omschrijving"
 
-#: ../../Zotlabs/Module/Appman.php:98
+#: ../../Zotlabs/Module/Appman.php:117
 msgid "Photo icon URL"
 msgstr "URL van pictogram"
 
-#: ../../Zotlabs/Module/Appman.php:98
+#: ../../Zotlabs/Module/Appman.php:117
 msgid "80 x 80 pixels - optional"
 msgstr "80 x 80 pixels (optioneel)"
 
-#: ../../Zotlabs/Module/Appman.php:99
+#: ../../Zotlabs/Module/Appman.php:118
+msgid "Categories (optional, comma separated list)"
+msgstr "Categorieën (optioneel,  door komma's gescheiden lijst)"
+
+#: ../../Zotlabs/Module/Appman.php:119
 msgid "Version ID"
 msgstr "Versie-ID"
 
-#: ../../Zotlabs/Module/Appman.php:100
+#: ../../Zotlabs/Module/Appman.php:120
 msgid "Price of app"
 msgstr "Prijs van de app"
 
-#: ../../Zotlabs/Module/Appman.php:101
+#: ../../Zotlabs/Module/Appman.php:121
 msgid "Location (URL) to purchase app"
 msgstr "Locatie (URL) om de app aan te schaffen"
 
-#: ../../Zotlabs/Module/Apps.php:40 ../../include/widgets.php:102
+#: ../../Zotlabs/Module/Apps.php:46 ../../include/widgets.php:102
 #: ../../include/nav.php:163
 msgid "Apps"
 msgstr "Apps"
@@ -1383,38 +1489,39 @@ msgstr "Ongeldig item."
 msgid "Channel not found."
 msgstr "Kanaal niet gevonden."
 
-#: ../../Zotlabs/Module/Blocks.php:99 ../../Zotlabs/Module/Blocks.php:154
+#: ../../Zotlabs/Module/Blocks.php:97 ../../Zotlabs/Module/Blocks.php:152
+#: ../../Zotlabs/Module/Editblock.php:108
 msgid "Block Name"
 msgstr "Bloknaam"
 
-#: ../../Zotlabs/Module/Blocks.php:153 ../../include/text.php:2251
+#: ../../Zotlabs/Module/Blocks.php:151 ../../include/text.php:2277
 msgid "Blocks"
 msgstr "Blokken"
 
-#: ../../Zotlabs/Module/Blocks.php:155
+#: ../../Zotlabs/Module/Blocks.php:153
 msgid "Block Title"
 msgstr "Bloktitel"
 
-#: ../../Zotlabs/Module/Blocks.php:156 ../../Zotlabs/Module/Layouts.php:186
-#: ../../Zotlabs/Module/Menu.php:114 ../../Zotlabs/Module/Webpages.php:200
+#: ../../Zotlabs/Module/Blocks.php:154 ../../Zotlabs/Module/Layouts.php:188
+#: ../../Zotlabs/Module/Menu.php:114 ../../Zotlabs/Module/Webpages.php:198
 #: ../../include/page_widgets.php:44
 msgid "Created"
 msgstr "Aangemaakt"
 
-#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Layouts.php:187
-#: ../../Zotlabs/Module/Menu.php:115 ../../Zotlabs/Module/Webpages.php:201
+#: ../../Zotlabs/Module/Blocks.php:155 ../../Zotlabs/Module/Layouts.php:189
+#: ../../Zotlabs/Module/Menu.php:115 ../../Zotlabs/Module/Webpages.php:199
 #: ../../include/page_widgets.php:45
 msgid "Edited"
 msgstr "Bewerkt"
 
-#: ../../Zotlabs/Module/Blocks.php:160 ../../Zotlabs/Module/Layouts.php:189
-#: ../../Zotlabs/Module/Photos.php:1071 ../../Zotlabs/Module/Webpages.php:190
-#: ../../include/conversation.php:1209
+#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Layouts.php:191
+#: ../../Zotlabs/Module/Photos.php:1072 ../../Zotlabs/Module/Webpages.php:188
+#: ../../include/conversation.php:1214
 msgid "Share"
 msgstr "Delen"
 
-#: ../../Zotlabs/Module/Blocks.php:165 ../../Zotlabs/Module/Layouts.php:193
-#: ../../Zotlabs/Module/Pubsites.php:46 ../../Zotlabs/Module/Webpages.php:195
+#: ../../Zotlabs/Module/Blocks.php:163 ../../Zotlabs/Module/Layouts.php:195
+#: ../../Zotlabs/Module/Pubsites.php:46 ../../Zotlabs/Module/Webpages.php:193
 #: ../../include/page_widgets.php:39
 msgid "View"
 msgstr "Weergeven"
@@ -1431,79 +1538,69 @@ msgstr "Mijn bladwijzers"
 msgid "My Connections Bookmarks"
 msgstr "Bladwijzers van mijn connecties"
 
-#: ../../Zotlabs/Module/Cal.php:41 ../../Zotlabs/Module/Photos.php:45
-#: ../../include/js_strings.php:13
-msgid "everybody"
-msgstr "iedereen"
-
 #: ../../Zotlabs/Module/Cal.php:72
 msgid "Permissions denied."
 msgstr "Permissies niet toegestaan"
 
-#: ../../Zotlabs/Module/Cal.php:262 ../../Zotlabs/Module/Events.php:585
+#: ../../Zotlabs/Module/Cal.php:262 ../../Zotlabs/Module/Events.php:588
 msgid "l, F j"
 msgstr "l j F"
 
-#: ../../Zotlabs/Module/Cal.php:311 ../../Zotlabs/Module/Events.php:634
-#: ../../include/text.php:1714
+#: ../../Zotlabs/Module/Cal.php:311 ../../Zotlabs/Module/Events.php:637
+#: ../../include/text.php:1743
 msgid "Link to Source"
 msgstr "Originele locatie"
 
-#: ../../Zotlabs/Module/Cal.php:334 ../../Zotlabs/Module/Events.php:662
+#: ../../Zotlabs/Module/Cal.php:334 ../../Zotlabs/Module/Events.php:665
 msgid "Edit Event"
 msgstr "Gebeurtenis bewerken"
 
-#: ../../Zotlabs/Module/Cal.php:334 ../../Zotlabs/Module/Events.php:662
+#: ../../Zotlabs/Module/Cal.php:334 ../../Zotlabs/Module/Events.php:665
 msgid "Create Event"
 msgstr "Gebeurtenis aanmaken"
 
 #: ../../Zotlabs/Module/Cal.php:335 ../../Zotlabs/Module/Cal.php:342
-#: ../../Zotlabs/Module/Events.php:663 ../../Zotlabs/Module/Events.php:670
-#: ../../Zotlabs/Module/Photos.php:948
+#: ../../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/Events.php:664 ../../Zotlabs/Module/Events.php:671
-#: ../../Zotlabs/Module/Photos.php:957 ../../Zotlabs/Module/Setup.php:290
+#: ../../Zotlabs/Module/Events.php:667 ../../Zotlabs/Module/Events.php:674
+#: ../../Zotlabs/Module/Photos.php:958 ../../Zotlabs/Module/Setup.php:290
 msgid "Next"
 msgstr "Volgende"
 
-#: ../../Zotlabs/Module/Cal.php:337 ../../Zotlabs/Module/Events.php:665
-#: ../../include/widgets.php:706
+#: ../../Zotlabs/Module/Cal.php:337 ../../Zotlabs/Module/Events.php:668
+#: ../../include/widgets.php:755
 msgid "Export"
 msgstr "Exporteren"
 
-#: ../../Zotlabs/Module/Cal.php:340 ../../Zotlabs/Module/Events.php:668
-#: ../../include/widgets.php:707
+#: ../../Zotlabs/Module/Cal.php:340 ../../Zotlabs/Module/Events.php:671
+#: ../../include/widgets.php:756
 msgid "Import"
 msgstr "Importeren"
 
-#: ../../Zotlabs/Module/Cal.php:344 ../../Zotlabs/Module/Events.php:672
+#: ../../Zotlabs/Module/Cal.php:344 ../../Zotlabs/Module/Events.php:675
 msgid "Today"
 msgstr "Vandaag"
 
-#: ../../Zotlabs/Module/Channel.php:28 ../../Zotlabs/Module/Chat.php:23
+#: ../../Zotlabs/Module/Channel.php:29 ../../Zotlabs/Module/Chat.php:23
 msgid "You must be logged in to see this page."
 msgstr "Je moet zijn ingelogd om deze pagina te kunnen bekijken."
 
-#: ../../Zotlabs/Module/Channel.php:40
+#: ../../Zotlabs/Module/Channel.php:41
 msgid "Posts and comments"
 msgstr "Berichten en reacties"
 
-#: ../../Zotlabs/Module/Channel.php:41
+#: ../../Zotlabs/Module/Channel.php:42
 msgid "Only posts"
 msgstr "Alleen berichten"
 
-#: ../../Zotlabs/Module/Channel.php:101
+#: ../../Zotlabs/Module/Channel.php:102
 msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr "Onvoldoende permissies.  Doorgestuurd naar profielpagina."
 
-#: ../../Zotlabs/Module/Channel.php:135 ../../Zotlabs/Module/Network.php:173
-#: ../../Zotlabs/Module/Rpost.php:118
-msgid "Public"
-msgstr "Openbaar"
-
 #: ../../Zotlabs/Module/Chat.php:179
 msgid "Room not found"
 msgstr "Chatkanaal niet gevonden"
@@ -1529,21 +1626,19 @@ 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:1170
+#: ../../Zotlabs/Module/Mail.php:320 ../../include/conversation.php:1182
 msgid "Please enter a link URL:"
 msgstr "Vul een URL in:"
 
-#: ../../Zotlabs/Module/Chat.php:204 ../../Zotlabs/Module/Editpost.php:163
-#: ../../Zotlabs/Module/Mail.php:259 ../../Zotlabs/Module/Mail.php:389
-#: ../../include/ItemObject.php:715 ../../include/conversation.php:1274
+#: ../../Zotlabs/Module/Chat.php:204 ../../Zotlabs/Module/Mail.php:259
+#: ../../Zotlabs/Module/Mail.php:389 ../../include/ItemObject.php:715
+#: ../../include/conversation.php:1262
 msgid "Encrypt text"
 msgstr "Tekst versleutelen"
 
-#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Editblock.php:148
-#: ../../Zotlabs/Module/Editlayout.php:147
-#: ../../Zotlabs/Module/Editpost.php:126
-#: ../../Zotlabs/Module/Editwebpage.php:188 ../../Zotlabs/Module/Mail.php:253
-#: ../../Zotlabs/Module/Mail.php:383 ../../include/conversation.php:1225
+#: ../../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
 msgid "Insert web link"
 msgstr "Weblink invoegen"
 
@@ -1563,10 +1658,10 @@ msgstr "Naam chatkanaal"
 msgid "Expiration of chats (minutes)"
 msgstr "Aantal minuten voordat chatberichten worden verwijderd"
 
-#: ../../Zotlabs/Module/Chat.php:233 ../../Zotlabs/Module/Filestorage.php:151
-#: ../../Zotlabs/Module/Photos.php:670 ../../Zotlabs/Module/Photos.php:1044
+#: ../../Zotlabs/Module/Chat.php:233 ../../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:251
+#: ../../include/acl_selectors.php:285
 msgid "Permissions"
 msgstr "Permissies"
 
@@ -1579,7 +1674,7 @@ msgstr "Chatkanalen van %1$s"
 msgid "No chatrooms available"
 msgstr "Geen chatkanalen beschikbaar"
 
-#: ../../Zotlabs/Module/Chat.php:250 ../../Zotlabs/Module/Manage.php:141
+#: ../../Zotlabs/Module/Chat.php:250 ../../Zotlabs/Module/Manage.php:143
 #: ../../Zotlabs/Module/Profiles.php:782
 msgid "Create New"
 msgstr "Nieuwe aanmaken"
@@ -1681,13 +1776,13 @@ msgstr "Gearchiveerd"
 
 #: ../../Zotlabs/Module/Connections.php:76
 #: ../../Zotlabs/Module/Connections.php:86 ../../Zotlabs/Module/Menu.php:116
-#: ../../include/conversation.php:1553
+#: ../../include/conversation.php:1541
 msgid "New"
 msgstr "Nieuw"
 
 #: ../../Zotlabs/Module/Connections.php:92
 #: ../../Zotlabs/Module/Connections.php:107
-#: ../../Zotlabs/Module/Connedit.php:597 ../../include/widgets.php:448
+#: ../../Zotlabs/Module/Connedit.php:597 ../../include/widgets.php:497
 msgid "All"
 msgstr "Alles"
 
@@ -1771,14 +1866,15 @@ msgstr "Negeren"
 msgid "Recent activity"
 msgstr "Recente activiteit"
 
-#: ../../Zotlabs/Module/Connections.php:302 ../../include/text.php:834
-#: ../../include/nav.php:186
+#: ../../Zotlabs/Module/Connections.php:302 ../../include/nav.php:186
+#: ../../include/text.php:863 ../../include/apps.php:159
 msgid "Connections"
 msgstr "Connecties"
 
 #: ../../Zotlabs/Module/Connections.php:306 ../../Zotlabs/Module/Search.php:44
-#: ../../include/text.php:904 ../../include/text.php:916
-#: ../../include/apps.php:147 ../../include/nav.php:165
+#: ../../include/acl_selectors.php:278 ../../include/nav.php:165
+#: ../../include/text.php:933 ../../include/text.php:945
+#: ../../include/apps.php:179
 msgid "Search"
 msgstr "Zoeken"
 
@@ -1834,8 +1930,8 @@ msgstr "Niet in staat om de parameters van connecties in te stellen."
 msgid "Connection has been removed."
 msgstr "Connectie is verwijderd"
 
-#: ../../Zotlabs/Module/Connedit.php:520 ../../include/conversation.php:959
-#: ../../include/nav.php:86
+#: ../../Zotlabs/Module/Connedit.php:520 ../../include/nav.php:86
+#: ../../include/conversation.php:959 ../../include/apps.php:170
 msgid "View Profile"
 msgstr "Profiel weergeven"
 
@@ -1917,24 +2013,24 @@ msgstr "Deze connectie is verborgen!"
 msgid "Delete this connection"
 msgstr "Deze connectie verwijderen"
 
-#: ../../Zotlabs/Module/Connedit.php:593 ../../include/widgets.php:444
+#: ../../Zotlabs/Module/Connedit.php:593 ../../include/widgets.php:493
 msgid "Me"
 msgstr "Ik"
 
-#: ../../Zotlabs/Module/Connedit.php:594 ../../include/widgets.php:445
+#: ../../Zotlabs/Module/Connedit.php:594 ../../include/widgets.php:494
 msgid "Family"
 msgstr "Familie"
 
-#: ../../Zotlabs/Module/Connedit.php:595 ../../Zotlabs/Module/Settings.php:340
-#: ../../Zotlabs/Module/Settings.php:344 ../../Zotlabs/Module/Settings.php:345
-#: ../../Zotlabs/Module/Settings.php:348 ../../Zotlabs/Module/Settings.php:359
+#: ../../Zotlabs/Module/Connedit.php:595 ../../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/identity.php:389 ../../include/identity.php:390
 #: ../../include/identity.php:397 ../../include/profile_selectors.php:80
-#: ../../include/widgets.php:446
+#: ../../include/widgets.php:495
 msgid "Friends"
 msgstr "Vrienden"
 
-#: ../../Zotlabs/Module/Connedit.php:596 ../../include/widgets.php:447
+#: ../../Zotlabs/Module/Connedit.php:596 ../../include/widgets.php:496
 msgid "Acquaintances"
 msgstr "Kennissen"
 
@@ -1962,11 +2058,11 @@ msgstr "Verwantschapsfilter en profiel instellen"
 msgid "none"
 msgstr "geen"
 
-#: ../../Zotlabs/Module/Connedit.php:705 ../../include/widgets.php:565
+#: ../../Zotlabs/Module/Connedit.php:705 ../../include/widgets.php:614
 msgid "Connection Default Permissions"
 msgstr "Standaard permissies voor connecties"
 
-#: ../../Zotlabs/Module/Connedit.php:705 ../../include/items.php:5159
+#: ../../Zotlabs/Module/Connedit.php:705 ../../include/items.php:3927
 #, php-format
 msgid "Connection: %s"
 msgstr "Connectie: %s"
@@ -2113,30 +2209,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:5587
+#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4271
 msgid "female"
 msgstr "vrouw"
 
-#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:5588
+#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4272
 #, 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:5589
+#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:4273
 msgid "male"
 msgstr "man"
 
-#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:5590
+#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4274
 #, 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:5592
+#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4276
 #, 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:1800
+#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/identity.php:1807
 msgid "cover photo"
 msgstr "omslagfoto"
 
@@ -2163,7 +2259,7 @@ msgstr "Omslagfoto uploaden"
 
 #: ../../Zotlabs/Module/Cover_photo.php:361
 #: ../../Zotlabs/Module/Profile_photo.php:374
-#: ../../Zotlabs/Module/Settings.php:983
+#: ../../Zotlabs/Module/Settings.php:985
 msgid "or"
 msgstr "of"
 
@@ -2192,12 +2288,8 @@ msgstr "Snij de afbeelding zo uit dat deze optimaal wordt weergegeven."
 msgid "Done Editing"
 msgstr "Klaar met bewerken"
 
-#: ../../Zotlabs/Module/Dav.php:127
-msgid "$Projectname channel"
-msgstr "$Projectname-kanaal"
-
 #: ../../Zotlabs/Module/Directory.php:63 ../../Zotlabs/Module/Display.php:21
-#: ../../Zotlabs/Module/Photos.php:521 ../../Zotlabs/Module/Ratings.php:86
+#: ../../Zotlabs/Module/Photos.php:522 ../../Zotlabs/Module/Ratings.php:86
 #: ../../Zotlabs/Module/Search.php:17
 #: ../../Zotlabs/Module/Viewconnections.php:21
 msgid "Public access denied."
@@ -2222,13 +2314,13 @@ msgstr "Status: "
 msgid "Homepage: "
 msgstr "Homepage: "
 
-#: ../../Zotlabs/Module/Directory.php:306 ../../include/identity.php:1322
+#: ../../Zotlabs/Module/Directory.php:306 ../../include/identity.php:1329
 msgid "Age:"
 msgstr "Leeftijd:"
 
-#: ../../Zotlabs/Module/Directory.php:311 ../../include/identity.php:1022
-#: ../../include/text.php:1452 ../../include/bb2diaspora.php:509
-#: ../../include/event.php:52
+#: ../../Zotlabs/Module/Directory.php:311 ../../include/identity.php:1029
+#: ../../include/event.php:52 ../../include/text.php:1481
+#: ../../include/bb2diaspora.php:509
 msgid "Location:"
 msgstr "Plaats:"
 
@@ -2236,18 +2328,18 @@ msgstr "Plaats:"
 msgid "Description:"
 msgstr "Omschrijving:"
 
-#: ../../Zotlabs/Module/Directory.php:322 ../../include/identity.php:1338
+#: ../../Zotlabs/Module/Directory.php:322 ../../include/identity.php:1345
 msgid "Hometown:"
 msgstr "Oorspronkelijk uit:"
 
-#: ../../Zotlabs/Module/Directory.php:324 ../../include/identity.php:1346
+#: ../../Zotlabs/Module/Directory.php:324 ../../include/identity.php:1353
 msgid "About:"
 msgstr "Over:"
 
 #: ../../Zotlabs/Module/Directory.php:325 ../../Zotlabs/Module/Match.php:68
-#: ../../Zotlabs/Module/Suggest.php:56 ../../include/identity.php:1007
-#: ../../include/conversation.php:961 ../../include/Contact.php:101
+#: ../../Zotlabs/Module/Suggest.php:56 ../../include/identity.php:1014
 #: ../../include/widgets.php:147 ../../include/widgets.php:184
+#: ../../include/Contact.php:101 ../../include/conversation.php:961
 msgid "Connect"
 msgstr "Verbinden"
 
@@ -2327,7 +2419,7 @@ 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:423
+#: ../../Zotlabs/Module/Subthread.php:62 ../../include/items.php:383
 #: ../../index.php:173
 msgid "Permission denied"
 msgstr "Toegang geweigerd"
@@ -2389,174 +2481,31 @@ msgstr "dubbel privébericht ontvangen"
 msgid "mail delivered"
 msgstr "privébericht afgeleverd"
 
-#: ../../Zotlabs/Module/Editblock.php:82 ../../Zotlabs/Module/Editblock.php:98
-#: ../../Zotlabs/Module/Editlayout.php:80 ../../Zotlabs/Module/Editpost.php:24
+#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95
+#: ../../Zotlabs/Module/Editlayout.php:79 ../../Zotlabs/Module/Editpost.php:24
 #: ../../Zotlabs/Module/Editwebpage.php:81
 msgid "Item not found"
 msgstr "Item niet gevonden"
 
-#: ../../Zotlabs/Module/Editblock.php:122
-msgid "Delete block?"
-msgstr "Blok verwijderen"
-
-#: ../../Zotlabs/Module/Editblock.php:141
-#: ../../Zotlabs/Module/Editlayout.php:140
-#: ../../Zotlabs/Module/Editpost.php:119
-#: ../../Zotlabs/Module/Editwebpage.php:182 ../../include/ItemObject.php:704
-#: ../../include/conversation.php:1216
-msgid "Bold"
-msgstr "Vet"
-
-#: ../../Zotlabs/Module/Editblock.php:142
-#: ../../Zotlabs/Module/Editlayout.php:141
-#: ../../Zotlabs/Module/Editpost.php:120
-#: ../../Zotlabs/Module/Editwebpage.php:183 ../../include/ItemObject.php:705
-#: ../../include/conversation.php:1217
-msgid "Italic"
-msgstr "Cursief"
-
-#: ../../Zotlabs/Module/Editblock.php:143
-#: ../../Zotlabs/Module/Editlayout.php:142
-#: ../../Zotlabs/Module/Editpost.php:121
-#: ../../Zotlabs/Module/Editwebpage.php:184 ../../include/ItemObject.php:706
-#: ../../include/conversation.php:1218
-msgid "Underline"
-msgstr "Onderstrepen"
-
-#: ../../Zotlabs/Module/Editblock.php:144
-#: ../../Zotlabs/Module/Editlayout.php:143
-#: ../../Zotlabs/Module/Editpost.php:122
-#: ../../Zotlabs/Module/Editwebpage.php:185 ../../include/ItemObject.php:707
-#: ../../include/conversation.php:1219
-msgid "Quote"
-msgstr "Citeren"
-
-#: ../../Zotlabs/Module/Editblock.php:145
-#: ../../Zotlabs/Module/Editlayout.php:144
-#: ../../Zotlabs/Module/Editpost.php:123
-#: ../../Zotlabs/Module/Editwebpage.php:186 ../../include/ItemObject.php:708
-#: ../../include/conversation.php:1220
-msgid "Code"
-msgstr "Broncode"
-
-#: ../../Zotlabs/Module/Editblock.php:147
-#: ../../Zotlabs/Module/Editlayout.php:146
-#: ../../Zotlabs/Module/Editpost.php:125
-#: ../../Zotlabs/Module/Editwebpage.php:187 ../../Zotlabs/Module/Mail.php:252
-#: ../../Zotlabs/Module/Mail.php:382 ../../include/conversation.php:1223
-msgid "Attach file"
-msgstr "Bestand toevoegen"
-
-#: ../../Zotlabs/Module/Editblock.php:151
-#: ../../Zotlabs/Module/Editlayout.php:154
-#: ../../Zotlabs/Module/Editpost.php:136
-#: ../../Zotlabs/Module/Editwebpage.php:191
-#: ../../Zotlabs/Module/Events.php:470 ../../include/conversation.php:1245
-msgid "Permission settings"
-msgstr "Permissies"
-
-#: ../../Zotlabs/Module/Editblock.php:159
-#: ../../Zotlabs/Module/Editlayout.php:161
-#: ../../Zotlabs/Module/Editpost.php:144
-#: ../../Zotlabs/Module/Editwebpage.php:200
-#: ../../include/conversation.php:1254
-msgid "Public post"
-msgstr "Openbaar bericht"
-
-#: ../../Zotlabs/Module/Editblock.php:162
-#: ../../Zotlabs/Module/Editpost.php:147
-#: ../../Zotlabs/Module/Editwebpage.php:205
-#: ../../include/conversation.php:1239
+#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1234
 msgid "Title (optional)"
 msgstr "Titel (optioneel)"
 
-#: ../../Zotlabs/Module/Editblock.php:165
-#: ../../Zotlabs/Module/Editlayout.php:168
-#: ../../Zotlabs/Module/Editpost.php:149
-#: ../../Zotlabs/Module/Editwebpage.php:207
-#: ../../include/conversation.php:1243
-msgid "Categories (optional, comma-separated list)"
-msgstr "Categorieën (optioneel, door komma's gescheiden lijst)"
-
-#: ../../Zotlabs/Module/Editblock.php:166
-#: ../../Zotlabs/Module/Editlayout.php:169
-#: ../../Zotlabs/Module/Editpost.php:150
-#: ../../Zotlabs/Module/Editwebpage.php:208
-#: ../../include/conversation.php:1256
-msgid "Example: bob@example.com, mary@example.com"
-msgstr "Voorbeeld: bob@voorbeeld.nl, mary@voorbeeld.be"
-
-#: ../../Zotlabs/Module/Editblock.php:171
-#: ../../Zotlabs/Module/Editpost.php:155
-#: ../../Zotlabs/Module/Editwebpage.php:212
-#: ../../Zotlabs/Module/Events.php:469 ../../Zotlabs/Module/Photos.php:1092
-#: ../../Zotlabs/Module/Webpages.php:196 ../../include/ItemObject.php:712
-#: ../../include/conversation.php:1186 ../../include/page_widgets.php:40
-msgid "Preview"
-msgstr "Voorvertoning"
-
-#: ../../Zotlabs/Module/Editblock.php:179
+#: ../../Zotlabs/Module/Editblock.php:133
 msgid "Edit Block"
 msgstr "Blok bewerken"
 
-#: ../../Zotlabs/Module/Editlayout.php:116
-msgid "Delete layout?"
-msgstr "Lay-out verwijderen?"
-
-#: ../../Zotlabs/Module/Editlayout.php:145
-#: ../../Zotlabs/Module/Editpost.php:124 ../../include/conversation.php:1221
-msgid "Upload photo"
-msgstr "Foto uploaden"
-
-#: ../../Zotlabs/Module/Editlayout.php:148
-#: ../../Zotlabs/Module/Editpost.php:127
-msgid "Insert YouTube video"
-msgstr "YouTube-video invoegen"
-
-#: ../../Zotlabs/Module/Editlayout.php:149
-#: ../../Zotlabs/Module/Editpost.php:128
-msgid "Insert Vorbis [.ogg] video"
-msgstr "Vorbis-video [.ogg] invoegen"
-
-#: ../../Zotlabs/Module/Editlayout.php:150
-#: ../../Zotlabs/Module/Editpost.php:129
-msgid "Insert Vorbis [.ogg] audio"
-msgstr "Vorbis-audio [.ogg] invoegen"
-
-#: ../../Zotlabs/Module/Editlayout.php:151
-#: ../../Zotlabs/Module/Editpost.php:130 ../../include/conversation.php:1231
-msgid "Set your location"
-msgstr "Locatie instellen"
-
-#: ../../Zotlabs/Module/Editlayout.php:152
-#: ../../Zotlabs/Module/Editpost.php:131 ../../include/conversation.php:1236
-msgid "Clear browser location"
-msgstr "Locatie van webbrowser wissen"
-
-#: ../../Zotlabs/Module/Editlayout.php:153
-#: ../../Zotlabs/Module/Editpost.php:135 ../../Zotlabs/Module/Photos.php:1072
-#: ../../include/ItemObject.php:389 ../../include/conversation.php:740
-#: ../../include/conversation.php:1244
-msgid "Please wait"
-msgstr "Even wachten"
-
-#: ../../Zotlabs/Module/Editlayout.php:164
-#: ../../Zotlabs/Module/Layouts.php:128
-msgid "Layout Description (Optional)"
-msgstr "Lay-out-omschrijving (optioneel)"
-
-#: ../../Zotlabs/Module/Editlayout.php:166
-#: ../../Zotlabs/Module/Layouts.php:125 ../../Zotlabs/Module/Layouts.php:184
+#: ../../Zotlabs/Module/Editlayout.php:126
+#: ../../Zotlabs/Module/Layouts.php:127 ../../Zotlabs/Module/Layouts.php:186
 msgid "Layout Name"
 msgstr "Naam lay-out"
 
-#: ../../Zotlabs/Module/Editlayout.php:178
-#: ../../Zotlabs/Module/Editpost.php:161 ../../Zotlabs/Module/Mail.php:257
-#: ../../Zotlabs/Module/Mail.php:387 ../../include/conversation.php:1269
-msgid "Set expiration date"
-msgstr "Verloopdatum instellen"
+#: ../../Zotlabs/Module/Editlayout.php:127
+#: ../../Zotlabs/Module/Layouts.php:130
+msgid "Layout Description (Optional)"
+msgstr "Lay-out-omschrijving (optioneel)"
 
-#: ../../Zotlabs/Module/Editlayout.php:183
+#: ../../Zotlabs/Module/Editlayout.php:135
 msgid "Edit Layout"
 msgstr "Lay-out bewerken"
 
@@ -2564,171 +2513,153 @@ msgstr "Lay-out bewerken"
 msgid "Item is not editable"
 msgstr "Item is niet te bewerken"
 
-#: ../../Zotlabs/Module/Editpost.php:60 ../../Zotlabs/Module/Mail.php:207
-#: ../../Zotlabs/Module/Mail.php:321 ../../include/conversation.php:1176
-msgid "Expires YYYY-MM-DD HH:MM"
-msgstr "Verloopt op DD-MM-YYYY om HH:MM"
-
-#: ../../Zotlabs/Module/Editpost.php:61
-msgid "Delete item?"
-msgstr "Item verwijderen?"
-
-#: ../../Zotlabs/Module/Editpost.php:132 ../../include/conversation.php:1233
-msgid "Toggle voting"
-msgstr "Peiling in- of uitschakelen"
-
-#: ../../Zotlabs/Module/Editpost.php:165 ../../include/conversation.php:1276
-msgid "OK"
-msgstr "OK"
-
-#: ../../Zotlabs/Module/Editpost.php:166 ../../Zotlabs/Module/Fbrowser.php:66
-#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Settings.php:589
-#: ../../Zotlabs/Module/Settings.php:615 ../../Zotlabs/Module/Tagrm.php:15
-#: ../../Zotlabs/Module/Tagrm.php:138 ../../include/conversation.php:1277
-msgid "Cancel"
-msgstr "Annuleren"
-
-#: ../../Zotlabs/Module/Editpost.php:171 ../../Zotlabs/Module/Rpost.php:134
+#: ../../Zotlabs/Module/Editpost.php:106 ../../Zotlabs/Module/Rpost.php:135
 msgid "Edit post"
 msgstr "Bericht bewerken"
 
-#: ../../Zotlabs/Module/Editwebpage.php:157
-msgid "Delete webpage?"
-msgstr "Webpagina verwijderen?"
+#: ../../Zotlabs/Module/Editwebpage.php:143
+msgid "Page link"
+msgstr "Paginalink"
 
-#: ../../Zotlabs/Module/Editwebpage.php:177
-msgid "Page link title"
-msgstr "Titel van paginalink"
-
-#: ../../Zotlabs/Module/Editwebpage.php:220
+#: ../../Zotlabs/Module/Editwebpage.php:169
 msgid "Edit Webpage"
 msgstr "Webpagina bewerken"
 
-#: ../../Zotlabs/Module/Events.php:25
+#: ../../Zotlabs/Module/Events.php:26
 msgid "Calendar entries imported."
 msgstr "Agenda-items geïmporteerd."
 
-#: ../../Zotlabs/Module/Events.php:27
+#: ../../Zotlabs/Module/Events.php:28
 msgid "No calendar entries found."
 msgstr "Geen agenda-items gevonden."
 
-#: ../../Zotlabs/Module/Events.php:104
+#: ../../Zotlabs/Module/Events.php:105
 msgid "Event can not end before it has started."
 msgstr "Gebeurtenis kan niet eindigen voordat het is begonnen"
 
-#: ../../Zotlabs/Module/Events.php:106 ../../Zotlabs/Module/Events.php:115
-#: ../../Zotlabs/Module/Events.php:135
+#: ../../Zotlabs/Module/Events.php:107 ../../Zotlabs/Module/Events.php:116
+#: ../../Zotlabs/Module/Events.php:136
 msgid "Unable to generate preview."
 msgstr "Niet in staat om voorvertoning te genereren"
 
-#: ../../Zotlabs/Module/Events.php:113
+#: ../../Zotlabs/Module/Events.php:114
 msgid "Event title and start time are required."
 msgstr "Titel en begintijd van gebeurtenis zijn vereist."
 
-#: ../../Zotlabs/Module/Events.php:133 ../../Zotlabs/Module/Events.php:258
+#: ../../Zotlabs/Module/Events.php:134 ../../Zotlabs/Module/Events.php:259
 msgid "Event not found."
 msgstr "Gebeurtenis niet gevonden"
 
-#: ../../Zotlabs/Module/Events.php:253 ../../Zotlabs/Module/Like.php:373
-#: ../../Zotlabs/Module/Tagger.php:51 ../../include/text.php:1943
-#: ../../include/conversation.php:123 ../../include/event.php:915
+#: ../../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
 msgid "event"
 msgstr "gebeurtenis"
 
-#: ../../Zotlabs/Module/Events.php:448
+#: ../../Zotlabs/Module/Events.php:449
 msgid "Edit event title"
 msgstr "Titel bewerken"
 
-#: ../../Zotlabs/Module/Events.php:448
+#: ../../Zotlabs/Module/Events.php:449
 msgid "Event title"
 msgstr "Titel"
 
-#: ../../Zotlabs/Module/Events.php:450
+#: ../../Zotlabs/Module/Events.php:451
 msgid "Categories (comma-separated list)"
 msgstr "Categorieën (door komma's gescheiden lijst)"
 
-#: ../../Zotlabs/Module/Events.php:451
+#: ../../Zotlabs/Module/Events.php:452
 msgid "Edit Category"
 msgstr "Categorie"
 
-#: ../../Zotlabs/Module/Events.php:451
+#: ../../Zotlabs/Module/Events.php:452
 msgid "Category"
 msgstr "Categorie"
 
-#: ../../Zotlabs/Module/Events.php:454
+#: ../../Zotlabs/Module/Events.php:455
 msgid "Edit start date and time"
 msgstr "Begindatum en -tijd bewerken"
 
-#: ../../Zotlabs/Module/Events.php:454
+#: ../../Zotlabs/Module/Events.php:455
 msgid "Start date and time"
 msgstr "Begindatum en -tijd"
 
-#: ../../Zotlabs/Module/Events.php:455 ../../Zotlabs/Module/Events.php:458
+#: ../../Zotlabs/Module/Events.php:456 ../../Zotlabs/Module/Events.php:459
 msgid "Finish date and time are not known or not relevant"
 msgstr "Einddatum en -tijd zijn niet bekend of niet van toepassing"
 
-#: ../../Zotlabs/Module/Events.php:457
+#: ../../Zotlabs/Module/Events.php:458
 msgid "Edit finish date and time"
 msgstr "Einddatum en -tijd bewerken"
 
-#: ../../Zotlabs/Module/Events.php:457
+#: ../../Zotlabs/Module/Events.php:458
 msgid "Finish date and time"
 msgstr "Einddatum en -tijd"
 
-#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:460
+#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:461
 msgid "Adjust for viewer timezone"
 msgstr "Aanpassen aan de tijdzone van wie deze gebeurtenis bekijkt"
 
-#: ../../Zotlabs/Module/Events.php:459
+#: ../../Zotlabs/Module/Events.php:460
 msgid ""
 "Important for events that happen in a particular place. Not practical for "
 "global holidays."
 msgstr "Belangrijk voor gebeurtenissen die op een bepaalde locatie plaatsvinden. Niet praktisch voor wereldwijde feestdagen."
 
-#: ../../Zotlabs/Module/Events.php:461
+#: ../../Zotlabs/Module/Events.php:462
 msgid "Edit Description"
 msgstr "Omschrijving bewerken"
 
-#: ../../Zotlabs/Module/Events.php:463
+#: ../../Zotlabs/Module/Events.php:464
 msgid "Edit Location"
 msgstr "Locatie bewerken"
 
-#: ../../Zotlabs/Module/Events.php:463 ../../Zotlabs/Module/Locs.php:117
+#: ../../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
 msgid "Location"
 msgstr "Locatie"
 
-#: ../../Zotlabs/Module/Events.php:466 ../../Zotlabs/Module/Events.php:468
+#: ../../Zotlabs/Module/Events.php:467 ../../Zotlabs/Module/Events.php:469
 msgid "Share this event"
 msgstr "Deel deze gebeurtenis"
 
-#: ../../Zotlabs/Module/Events.php:473
+#: ../../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
+msgid "Preview"
+msgstr "Voorvertoning"
+
+#: ../../Zotlabs/Module/Events.php:471 ../../include/conversation.php:1238
+msgid "Permission settings"
+msgstr "Permissies"
+
+#: ../../Zotlabs/Module/Events.php:476
 msgid "Advanced Options"
 msgstr "Geavanceerde opties"
 
-#: ../../Zotlabs/Module/Events.php:607
+#: ../../Zotlabs/Module/Events.php:610
 msgid "Edit event"
 msgstr "Gebeurtenis bewerken"
 
-#: ../../Zotlabs/Module/Events.php:609
+#: ../../Zotlabs/Module/Events.php:612
 msgid "Delete event"
 msgstr "Gebeurtenis verwijderen"
 
-#: ../../Zotlabs/Module/Events.php:643
+#: ../../Zotlabs/Module/Events.php:646
 msgid "calendar"
 msgstr "agenda"
 
-#: ../../Zotlabs/Module/Events.php:703
+#: ../../Zotlabs/Module/Events.php:706
 msgid "Event removed"
 msgstr "Gebeurtenis verwijderd"
 
-#: ../../Zotlabs/Module/Events.php:706
+#: ../../Zotlabs/Module/Events.php:709
 msgid "Failed to remove event"
 msgstr "Verwijderen gebeurtenis mislukt"
 
-#: ../../Zotlabs/Module/Fbrowser.php:29 ../../include/apps.php:139
-#: ../../include/conversation.php:1650 ../../include/nav.php:92
+#: ../../Zotlabs/Module/Fbrowser.php:29 ../../include/nav.php:92
+#: ../../include/conversation.php:1638 ../../include/apps.php:171
 msgid "Photos"
 msgstr "Foto's"
 
@@ -2740,7 +2671,7 @@ msgstr "Deel webpagina's vanuit Firefox met "
 msgid "Activate the Firefox $Projectname provider"
 msgstr "Activeer de $Projectname-service in Firefox"
 
-#: ../../Zotlabs/Module/Filer.php:52 ../../include/conversation.php:1174
+#: ../../Zotlabs/Module/Filer.php:52
 msgid "Save to Folder:"
 msgstr "Bewaar in map: "
 
@@ -2748,51 +2679,51 @@ msgstr "Bewaar in map: "
 msgid "- select -"
 msgstr "- kies map -"
 
-#: ../../Zotlabs/Module/Filestorage.php:86
+#: ../../Zotlabs/Module/Filestorage.php:88
 msgid "Permission Denied."
 msgstr "Toegang geweigerd"
 
-#: ../../Zotlabs/Module/Filestorage.php:102
+#: ../../Zotlabs/Module/Filestorage.php:104
 msgid "File not found."
 msgstr "Bestand niet gevonden."
 
-#: ../../Zotlabs/Module/Filestorage.php:145
+#: ../../Zotlabs/Module/Filestorage.php:147
 msgid "Edit file permissions"
 msgstr "Bestandsrechten bewerken"
 
-#: ../../Zotlabs/Module/Filestorage.php:154
+#: ../../Zotlabs/Module/Filestorage.php:156
 msgid "Set/edit permissions"
 msgstr "Rechten instellen/bewerken"
 
-#: ../../Zotlabs/Module/Filestorage.php:155
+#: ../../Zotlabs/Module/Filestorage.php:157
 msgid "Include all files and sub folders"
 msgstr "Toepassen op alle bestanden en submappen"
 
-#: ../../Zotlabs/Module/Filestorage.php:156
+#: ../../Zotlabs/Module/Filestorage.php:158
 msgid "Return to file list"
 msgstr "Terugkeren naar bestandlijst "
 
-#: ../../Zotlabs/Module/Filestorage.php:158
+#: ../../Zotlabs/Module/Filestorage.php:160
 msgid "Copy/paste this code to attach file to a post"
 msgstr "Kopieer/plak deze code om het bestand aan een bericht te koppelen"
 
-#: ../../Zotlabs/Module/Filestorage.php:159
+#: ../../Zotlabs/Module/Filestorage.php:161
 msgid "Copy/paste this URL to link file from a web page"
 msgstr "Kopieer/plak deze URL om het bestand aan een externe webpagina te koppelen"
 
-#: ../../Zotlabs/Module/Filestorage.php:161
+#: ../../Zotlabs/Module/Filestorage.php:163
 msgid "Share this file"
 msgstr "Dit bestand delen"
 
-#: ../../Zotlabs/Module/Filestorage.php:162
+#: ../../Zotlabs/Module/Filestorage.php:164
 msgid "Show URL to this file"
 msgstr "Toon URL van dit bestand"
 
-#: ../../Zotlabs/Module/Filestorage.php:163
+#: ../../Zotlabs/Module/Filestorage.php:165
 msgid "Notify your contacts about this file"
 msgstr "Jouw connecties over dit bestand berichten"
 
-#: ../../Zotlabs/Module/Follow.php:31
+#: ../../Zotlabs/Module/Follow.php:34
 msgid "Channel added."
 msgstr "Kanaal toegevoegd."
 
@@ -2822,7 +2753,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:5126
+#: ../../include/items.php:3894
 msgid "Privacy group not found."
 msgstr "Privacygroep niet gevonden"
 
@@ -2876,8 +2807,8 @@ msgid "Help:"
 msgstr "Hulp:"
 
 #: ../../Zotlabs/Module/Help.php:85 ../../Zotlabs/Module/Help.php:90
-#: ../../Zotlabs/Module/Layouts.php:181 ../../include/apps.php:142
-#: ../../include/nav.php:159
+#: ../../Zotlabs/Module/Layouts.php:183 ../../include/nav.php:159
+#: ../../include/apps.php:174
 msgid "Help"
 msgstr "Hulp"
 
@@ -2912,7 +2843,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:155
+#: ../../Zotlabs/Module/Id.php:21 ../../include/apps.php:187
 msgid "Profile Photo"
 msgstr "Profielfoto"
 
@@ -2948,7 +2879,7 @@ msgstr "Tijdzone"
 msgid "Homepage URL"
 msgstr "URL homepagina"
 
-#: ../../Zotlabs/Module/Id.php:30 ../../include/apps.php:153
+#: ../../Zotlabs/Module/Id.php:30 ../../include/apps.php:185
 msgid "Language"
 msgstr "Taal"
 
@@ -3032,7 +2963,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:80
+#: ../../Zotlabs/Module/Import.php:150 ../../include/import.php:84
 msgid "Cloned channel not found. Import failed."
 msgstr "Gekloond kanaal niet gevonden. Importeren mislukt."
 
@@ -3222,19 +3153,19 @@ 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:179 ../../include/text.php:2253
+#: ../../Zotlabs/Module/Layouts.php:181 ../../include/text.php:2279
 msgid "Layouts"
 msgstr "Lay-outs"
 
-#: ../../Zotlabs/Module/Layouts.php:181
+#: ../../Zotlabs/Module/Layouts.php:183
 msgid "Comanche page description language help"
 msgstr "Hulp met de paginabeschrijvingstaal Comanche"
 
-#: ../../Zotlabs/Module/Layouts.php:185
+#: ../../Zotlabs/Module/Layouts.php:187
 msgid "Layout Description"
 msgstr "Lay-out-omschrijving"
 
-#: ../../Zotlabs/Module/Layouts.php:190
+#: ../../Zotlabs/Module/Layouts.php:192
 msgid "Download PDL file"
 msgstr "Download PDL-bestand"
 
@@ -3274,13 +3205,13 @@ msgid "Previous action reversed."
 msgstr "Vorige actie omgedraaid"
 
 #: ../../Zotlabs/Module/Like.php:371 ../../Zotlabs/Module/Subthread.php:87
-#: ../../Zotlabs/Module/Tagger.php:47 ../../include/text.php:1940
-#: ../../include/conversation.php:120
+#: ../../Zotlabs/Module/Tagger.php:47 ../../include/conversation.php:120
+#: ../../include/text.php:1952
 msgid "photo"
 msgstr "foto"
 
 #: ../../Zotlabs/Module/Like.php:371 ../../Zotlabs/Module/Subthread.php:87
-#: ../../include/text.php:1946 ../../include/conversation.php:148
+#: ../../include/conversation.php:148 ../../include/text.php:1958
 msgid "status"
 msgstr "bericht"
 
@@ -3497,6 +3428,10 @@ msgstr "Bericht ingetrokken."
 msgid "Conversation removed."
 msgstr "Conversatie verwijderd"
 
+#: ../../Zotlabs/Module/Mail.php:207 ../../Zotlabs/Module/Mail.php:321
+msgid "Expires YYYY-MM-DD HH:MM"
+msgstr "Verloopt op DD-MM-YYYY om HH:MM"
+
 #: ../../Zotlabs/Module/Mail.php:235
 msgid "Requested channel is not in this network"
 msgstr "Opgevraagd kanaal is niet in dit netwerk beschikbaar"
@@ -3513,10 +3448,20 @@ msgstr "Aan:"
 msgid "Subject:"
 msgstr "Onderwerp:"
 
+#: ../../Zotlabs/Module/Mail.php:252 ../../Zotlabs/Module/Mail.php:382
+#: ../../include/conversation.php:1226
+msgid "Attach file"
+msgstr "Bestand toevoegen"
+
 #: ../../Zotlabs/Module/Mail.php:254
 msgid "Send"
 msgstr "Verzenden"
 
+#: ../../Zotlabs/Module/Mail.php:257 ../../Zotlabs/Module/Mail.php:387
+#: ../../include/conversation.php:1257
+msgid "Set expiration date"
+msgstr "Verloopdatum instellen"
+
 #: ../../Zotlabs/Module/Mail.php:346
 msgid "Delete message"
 msgstr "Bericht verwijderen"
@@ -3552,48 +3497,48 @@ msgstr "Antwoord versturen"
 msgid "Your message for %s (%s):"
 msgstr "Jouw privébericht aan %s (%s):"
 
-#: ../../Zotlabs/Module/Manage.php:134
+#: ../../Zotlabs/Module/Manage.php:136
 #: ../../Zotlabs/Module/New_channel.php:121
 #, php-format
 msgid "You have created %1$.0f of %2$.0f allowed channels."
 msgstr "Je hebt %1$.0f van totaal %2$.0f toegestane kanalen aangemaakt."
 
-#: ../../Zotlabs/Module/Manage.php:141
+#: ../../Zotlabs/Module/Manage.php:143
 msgid "Create a new channel"
 msgstr "Nieuw kanaal aanmaken"
 
-#: ../../Zotlabs/Module/Manage.php:162 ../../include/apps.php:132
-#: ../../include/nav.php:206
+#: ../../Zotlabs/Module/Manage.php:164 ../../include/nav.php:206
+#: ../../include/apps.php:164
 msgid "Channel Manager"
 msgstr "Kanaalbeheer"
 
-#: ../../Zotlabs/Module/Manage.php:163
+#: ../../Zotlabs/Module/Manage.php:165
 msgid "Current Channel"
 msgstr "Huidig kanaal"
 
-#: ../../Zotlabs/Module/Manage.php:165
+#: ../../Zotlabs/Module/Manage.php:167
 msgid "Switch to one of your channels by selecting it."
 msgstr "Activeer een van jouw andere kanalen door er op te klikken."
 
-#: ../../Zotlabs/Module/Manage.php:166
+#: ../../Zotlabs/Module/Manage.php:168
 msgid "Default Channel"
 msgstr "Standaardkanaal"
 
-#: ../../Zotlabs/Module/Manage.php:167
+#: ../../Zotlabs/Module/Manage.php:169
 msgid "Make Default"
 msgstr "Als standaard instellen"
 
-#: ../../Zotlabs/Module/Manage.php:170
+#: ../../Zotlabs/Module/Manage.php:172
 #, php-format
 msgid "%d new messages"
 msgstr "%d nieuwe berichten"
 
-#: ../../Zotlabs/Module/Manage.php:171
+#: ../../Zotlabs/Module/Manage.php:173
 #, php-format
 msgid "%d new introductions"
 msgstr "%d nieuwe connectieverzoeken"
 
-#: ../../Zotlabs/Module/Manage.php:173
+#: ../../Zotlabs/Module/Manage.php:175
 msgid "Delegated Channel"
 msgstr "Uitbesteed kanaal"
 
@@ -3649,7 +3594,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:2252
+#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2278
 msgid "Menus"
 msgstr "Menu's"
 
@@ -3727,7 +3672,7 @@ msgid "Menu Item Permissions"
 msgstr "Permissies menu-item"
 
 #: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:227
-#: ../../Zotlabs/Module/Settings.php:1066
+#: ../../Zotlabs/Module/Settings.php:1068
 msgid "(click to open/close)"
 msgstr "(klik om te openen/sluiten)"
 
@@ -3833,7 +3778,7 @@ msgctxt "mood"
 msgid "%1$s is %2$s"
 msgstr "%1$s is %2$s"
 
-#: ../../Zotlabs/Module/Mood.php:135 ../../include/apps.php:144
+#: ../../Zotlabs/Module/Mood.php:135 ../../include/apps.php:176
 msgid "Mood"
 msgstr "Stemming"
 
@@ -3841,31 +3786,31 @@ msgstr "Stemming"
 msgid "Set your current mood and tell your friends"
 msgstr "Noteer je huidige stemming en toon het aan je connecties"
 
-#: ../../Zotlabs/Module/Network.php:95
+#: ../../Zotlabs/Module/Network.php:96
 msgid "No such group"
 msgstr "Collectie niet gevonden"
 
-#: ../../Zotlabs/Module/Network.php:135
+#: ../../Zotlabs/Module/Network.php:136
 msgid "No such channel"
 msgstr "Niet zo'n kanaal"
 
-#: ../../Zotlabs/Module/Network.php:140
+#: ../../Zotlabs/Module/Network.php:141
 msgid "forum"
 msgstr "forum"
 
-#: ../../Zotlabs/Module/Network.php:152
+#: ../../Zotlabs/Module/Network.php:153
 msgid "Search Results For:"
 msgstr "Zoekresultaten voor:"
 
-#: ../../Zotlabs/Module/Network.php:216
+#: ../../Zotlabs/Module/Network.php:217
 msgid "Privacy group is empty"
 msgstr "Privacygroep is leeg"
 
-#: ../../Zotlabs/Module/Network.php:225
+#: ../../Zotlabs/Module/Network.php:226
 msgid "Privacy group: "
 msgstr "Privacygroep: "
 
-#: ../../Zotlabs/Module/Network.php:251
+#: ../../Zotlabs/Module/Network.php:252
 msgid "Invalid connection."
 msgstr "Ongeldige connectie."
 
@@ -4006,11 +3951,11 @@ msgstr "Modulenaam:"
 msgid "Layout Help"
 msgstr "Lay-out-hulp"
 
-#: ../../Zotlabs/Module/Photos.php:83
+#: ../../Zotlabs/Module/Photos.php:84
 msgid "Page owner information could not be retrieved."
 msgstr "Informatie over de pagina-eigenaar werd niet ontvangen."
 
-#: ../../Zotlabs/Module/Photos.php:98 ../../Zotlabs/Module/Photos.php:742
+#: ../../Zotlabs/Module/Photos.php:99 ../../Zotlabs/Module/Photos.php:743
 #: ../../Zotlabs/Module/Profile_photo.php:114
 #: ../../Zotlabs/Module/Profile_photo.php:206
 #: ../../Zotlabs/Module/Profile_photo.php:294
@@ -4018,271 +3963,272 @@ msgstr "Informatie over de pagina-eigenaar werd niet ontvangen."
 msgid "Profile Photos"
 msgstr "Profielfoto's"
 
-#: ../../Zotlabs/Module/Photos.php:104 ../../Zotlabs/Module/Photos.php:148
+#: ../../Zotlabs/Module/Photos.php:105 ../../Zotlabs/Module/Photos.php:149
 msgid "Album not found."
 msgstr "Album niet gevonden."
 
-#: ../../Zotlabs/Module/Photos.php:131
+#: ../../Zotlabs/Module/Photos.php:132
 msgid "Delete Album"
 msgstr "Verwijder album"
 
-#: ../../Zotlabs/Module/Photos.php:152
+#: ../../Zotlabs/Module/Photos.php:153
 msgid ""
 "Multiple storage folders exist with this album name, but within different "
 "directories. Please remove the desired folder or folders using the Files "
 "manager"
 msgstr "Er bestaan meerdere submappen met deze albumnaam, maar verspreidt over verschillende mappen. Verwijder de gewenste map(pen) met de bestandsbeheerder."
 
-#: ../../Zotlabs/Module/Photos.php:209 ../../Zotlabs/Module/Photos.php:1052
+#: ../../Zotlabs/Module/Photos.php:210 ../../Zotlabs/Module/Photos.php:1053
 msgid "Delete Photo"
 msgstr "Verwijder foto"
 
-#: ../../Zotlabs/Module/Photos.php:532
+#: ../../Zotlabs/Module/Photos.php:533
 msgid "No photos selected"
 msgstr "Geen foto's geselecteerd"
 
-#: ../../Zotlabs/Module/Photos.php:581
+#: ../../Zotlabs/Module/Photos.php:582
 msgid "Access to this item is restricted."
 msgstr "Toegang tot dit item is beperkt."
 
-#: ../../Zotlabs/Module/Photos.php:620
+#: ../../Zotlabs/Module/Photos.php:621
 #, php-format
 msgid "%1$.2f MB of %2$.2f MB photo storage used."
 msgstr "%1$.2f MB van %2$.2f MB aan foto-opslag gebruikt."
 
-#: ../../Zotlabs/Module/Photos.php:623
+#: ../../Zotlabs/Module/Photos.php:624
 #, php-format
 msgid "%1$.2f MB photo storage used."
 msgstr "%1$.2f MB aan foto-opslag gebruikt."
 
-#: ../../Zotlabs/Module/Photos.php:659
+#: ../../Zotlabs/Module/Photos.php:660
 msgid "Upload Photos"
 msgstr "Foto's uploaden"
 
-#: ../../Zotlabs/Module/Photos.php:663
+#: ../../Zotlabs/Module/Photos.php:664
 msgid "Enter an album name"
 msgstr "Vul een albumnaam in"
 
-#: ../../Zotlabs/Module/Photos.php:664
+#: ../../Zotlabs/Module/Photos.php:665
 msgid "or select an existing album (doubleclick)"
 msgstr "of kies een bestaand album (dubbelklikken)"
 
-#: ../../Zotlabs/Module/Photos.php:665
+#: ../../Zotlabs/Module/Photos.php:666
 msgid "Create a status post for this upload"
 msgstr "Plaats een bericht voor deze upload."
 
-#: ../../Zotlabs/Module/Photos.php:666
+#: ../../Zotlabs/Module/Photos.php:667
 msgid "Caption (optional):"
 msgstr "Bijschrift (optioneel):"
 
-#: ../../Zotlabs/Module/Photos.php:667
+#: ../../Zotlabs/Module/Photos.php:668
 msgid "Description (optional):"
 msgstr "Omschrijving (optioneel):"
 
-#: ../../Zotlabs/Module/Photos.php:694
+#: ../../Zotlabs/Module/Photos.php:695
 msgid "Album name could not be decoded"
 msgstr "Albumnaam kon niet gedecodeerd worden"
 
-#: ../../Zotlabs/Module/Photos.php:742 ../../Zotlabs/Module/Photos.php:1283
-#: ../../Zotlabs/Module/Photos.php:1300
+#: ../../Zotlabs/Module/Photos.php:743 ../../Zotlabs/Module/Photos.php:1284
+#: ../../Zotlabs/Module/Photos.php:1301
 msgid "Contact Photos"
 msgstr "Connectiefoto's"
 
-#: ../../Zotlabs/Module/Photos.php:765
+#: ../../Zotlabs/Module/Photos.php:766
 msgid "Show Newest First"
 msgstr "Nieuwste eerst weergeven"
 
-#: ../../Zotlabs/Module/Photos.php:767
+#: ../../Zotlabs/Module/Photos.php:768
 msgid "Show Oldest First"
 msgstr "Oudste eerst weergeven"
 
-#: ../../Zotlabs/Module/Photos.php:791 ../../Zotlabs/Module/Photos.php:1333
-#: ../../include/widgets.php:1451
+#: ../../Zotlabs/Module/Photos.php:792 ../../Zotlabs/Module/Photos.php:1334
+#: ../../include/widgets.php:1500
 msgid "View Photo"
 msgstr "Foto weergeven"
 
-#: ../../Zotlabs/Module/Photos.php:822 ../../include/widgets.php:1468
+#: ../../Zotlabs/Module/Photos.php:823 ../../include/widgets.php:1517
 msgid "Edit Album"
 msgstr "Album bewerken"
 
-#: ../../Zotlabs/Module/Photos.php:869
+#: ../../Zotlabs/Module/Photos.php:870
 msgid "Permission denied. Access to this item may be restricted."
 msgstr "Toegang geweigerd. Toegang tot dit item kan zijn beperkt."
 
-#: ../../Zotlabs/Module/Photos.php:871
+#: ../../Zotlabs/Module/Photos.php:872
 msgid "Photo not available"
 msgstr "Foto niet aanwezig"
 
-#: ../../Zotlabs/Module/Photos.php:929
+#: ../../Zotlabs/Module/Photos.php:930
 msgid "Use as profile photo"
 msgstr "Als profielfoto gebruiken"
 
-#: ../../Zotlabs/Module/Photos.php:930
+#: ../../Zotlabs/Module/Photos.php:931
 msgid "Use as cover photo"
 msgstr "Als omslagfoto gebruiken"
 
-#: ../../Zotlabs/Module/Photos.php:937
+#: ../../Zotlabs/Module/Photos.php:938
 msgid "Private Photo"
 msgstr "Privéfoto"
 
-#: ../../Zotlabs/Module/Photos.php:952
+#: ../../Zotlabs/Module/Photos.php:953
 msgid "View Full Size"
 msgstr "Volledige grootte weergeven"
 
-#: ../../Zotlabs/Module/Photos.php:997 ../../Zotlabs/Module/Tagrm.php:137
-msgid "Remove"
-msgstr "Verwijderen"
-
-#: ../../Zotlabs/Module/Photos.php:1031
+#: ../../Zotlabs/Module/Photos.php:1032
 msgid "Edit photo"
 msgstr "Foto bewerken"
 
-#: ../../Zotlabs/Module/Photos.php:1033
+#: ../../Zotlabs/Module/Photos.php:1034
 msgid "Rotate CW (right)"
 msgstr "Draai met de klok mee (naar rechts)"
 
-#: ../../Zotlabs/Module/Photos.php:1034
+#: ../../Zotlabs/Module/Photos.php:1035
 msgid "Rotate CCW (left)"
 msgstr "Draai tegen de klok in (naar links)"
 
-#: ../../Zotlabs/Module/Photos.php:1037
+#: ../../Zotlabs/Module/Photos.php:1038
 msgid "Enter a new album name"
 msgstr "Vul een nieuwe albumnaam in"
 
-#: ../../Zotlabs/Module/Photos.php:1038
+#: ../../Zotlabs/Module/Photos.php:1039
 msgid "or select an existing one (doubleclick)"
 msgstr "of kies een bestaand album (dubbelklikken)"
 
-#: ../../Zotlabs/Module/Photos.php:1041
+#: ../../Zotlabs/Module/Photos.php:1042
 msgid "Caption"
 msgstr "Bijschrift"
 
-#: ../../Zotlabs/Module/Photos.php:1043
+#: ../../Zotlabs/Module/Photos.php:1044
 msgid "Add a Tag"
 msgstr "Tag toevoegen"
 
-#: ../../Zotlabs/Module/Photos.php:1047
+#: ../../Zotlabs/Module/Photos.php:1048
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
 msgstr "Voorbeeld: @bob, @Barbara_Jansen, @jan@voorbeeld.nl"
 
-#: ../../Zotlabs/Module/Photos.php:1050
+#: ../../Zotlabs/Module/Photos.php:1051
 msgid "Flag as adult in album view"
 msgstr "Markeer als voor volwassenen in albumweergave"
 
-#: ../../Zotlabs/Module/Photos.php:1069 ../../include/ItemObject.php:254
+#: ../../Zotlabs/Module/Photos.php:1070 ../../include/ItemObject.php:254
 msgid "I like this (toggle)"
 msgstr "Vind ik leuk"
 
-#: ../../Zotlabs/Module/Photos.php:1070 ../../include/ItemObject.php:255
+#: ../../Zotlabs/Module/Photos.php:1071 ../../include/ItemObject.php:255
 msgid "I don't like this (toggle)"
 msgstr "Vind ik niet leuk"
 
-#: ../../Zotlabs/Module/Photos.php:1088 ../../Zotlabs/Module/Photos.php:1206
+#: ../../Zotlabs/Module/Photos.php:1073 ../../include/ItemObject.php:389
+#: ../../include/conversation.php:740
+msgid "Please wait"
+msgstr "Even wachten"
+
+#: ../../Zotlabs/Module/Photos.php:1089 ../../Zotlabs/Module/Photos.php:1207
 #: ../../include/ItemObject.php:700
 msgid "This is you"
 msgstr "Dit ben jij"
 
-#: ../../Zotlabs/Module/Photos.php:1090 ../../Zotlabs/Module/Photos.php:1208
+#: ../../Zotlabs/Module/Photos.php:1091 ../../Zotlabs/Module/Photos.php:1209
 #: ../../include/ItemObject.php:702 ../../include/js_strings.php:6
 msgid "Comment"
 msgstr "Reactie"
 
-#: ../../Zotlabs/Module/Photos.php:1106 ../../include/conversation.php:574
+#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:574
 msgctxt "title"
 msgid "Likes"
 msgstr "vinden dit leuk"
 
-#: ../../Zotlabs/Module/Photos.php:1106 ../../include/conversation.php:574
+#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:574
 msgctxt "title"
 msgid "Dislikes"
 msgstr "vinden dit niet leuk"
 
-#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:575
+#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:575
 msgctxt "title"
 msgid "Agree"
 msgstr "eens"
 
-#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:575
+#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:575
 msgctxt "title"
 msgid "Disagree"
 msgstr "oneens"
 
-#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:575
+#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:575
 msgctxt "title"
 msgid "Abstain"
 msgstr "onthoudingen"
 
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:576
+#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:576
 msgctxt "title"
 msgid "Attending"
 msgstr "aanwezig"
 
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:576
+#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:576
 msgctxt "title"
 msgid "Not attending"
 msgstr "niet aanwezig"
 
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:576
+#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:576
 msgctxt "title"
 msgid "Might attend"
 msgstr "mogelijk aanwezig"
 
-#: ../../Zotlabs/Module/Photos.php:1125 ../../Zotlabs/Module/Photos.php:1137
+#: ../../Zotlabs/Module/Photos.php:1126 ../../Zotlabs/Module/Photos.php:1138
 #: ../../include/ItemObject.php:175 ../../include/ItemObject.php:187
-#: ../../include/conversation.php:1736
+#: ../../include/conversation.php:1724
 msgid "View all"
 msgstr "Toon alles"
 
-#: ../../Zotlabs/Module/Photos.php:1129 ../../include/identity.php:1297
-#: ../../include/ItemObject.php:179 ../../include/conversation.php:1760
-#: ../../include/taxonomy.php:415
+#: ../../Zotlabs/Module/Photos.php:1130 ../../include/identity.php:1304
+#: ../../include/ItemObject.php:179 ../../include/conversation.php:1748
+#: ../../include/taxonomy.php:403
 msgctxt "noun"
 msgid "Like"
 msgid_plural "Likes"
 msgstr[0] "vindt dit leuk"
 msgstr[1] "vinden dit leuk"
 
-#: ../../Zotlabs/Module/Photos.php:1134 ../../include/ItemObject.php:184
-#: ../../include/conversation.php:1763
+#: ../../Zotlabs/Module/Photos.php:1135 ../../include/ItemObject.php:184
+#: ../../include/conversation.php:1751
 msgctxt "noun"
 msgid "Dislike"
 msgid_plural "Dislikes"
 msgstr[0] "vindt dit niet leuk"
 msgstr[1] "vinden dit niet leuk"
 
-#: ../../Zotlabs/Module/Photos.php:1234
+#: ../../Zotlabs/Module/Photos.php:1235
 msgid "Photo Tools"
 msgstr "Hulpmiddelen"
 
-#: ../../Zotlabs/Module/Photos.php:1243
+#: ../../Zotlabs/Module/Photos.php:1244
 msgid "In This Photo:"
 msgstr "Op deze foto:"
 
-#: ../../Zotlabs/Module/Photos.php:1248
+#: ../../Zotlabs/Module/Photos.php:1249
 msgid "Map"
 msgstr "Kaart"
 
-#: ../../Zotlabs/Module/Photos.php:1256 ../../include/ItemObject.php:378
+#: ../../Zotlabs/Module/Photos.php:1257 ../../include/ItemObject.php:378
 msgctxt "noun"
 msgid "Likes"
 msgstr "vinden dit leuk"
 
-#: ../../Zotlabs/Module/Photos.php:1257 ../../include/ItemObject.php:379
+#: ../../Zotlabs/Module/Photos.php:1258 ../../include/ItemObject.php:379
 msgctxt "noun"
 msgid "Dislikes"
 msgstr "vinden dit niet leuk"
 
-#: ../../Zotlabs/Module/Photos.php:1262 ../../include/ItemObject.php:384
-#: ../../include/acl_selectors.php:252
+#: ../../Zotlabs/Module/Photos.php:1263 ../../include/acl_selectors.php:287
+#: ../../include/ItemObject.php:384
 msgid "Close"
 msgstr "Sluiten"
 
-#: ../../Zotlabs/Module/Photos.php:1339
+#: ../../Zotlabs/Module/Photos.php:1340
 msgid "View Album"
 msgstr "Album weergeven"
 
-#: ../../Zotlabs/Module/Photos.php:1350 ../../Zotlabs/Module/Photos.php:1363
-#: ../../Zotlabs/Module/Photos.php:1364
+#: ../../Zotlabs/Module/Photos.php:1351 ../../Zotlabs/Module/Photos.php:1364
+#: ../../Zotlabs/Module/Photos.php:1365
 msgid "Recent Photos"
 msgstr "Recente foto's"
 
@@ -4294,13 +4240,13 @@ msgstr "stuurde jou een privébericht"
 msgid "added your channel"
 msgstr "voegde jouw kanaal toe"
 
-#: ../../Zotlabs/Module/Ping.php:322 ../../include/identity.php:1116
-#: ../../include/identity.php:1192
+#: ../../Zotlabs/Module/Ping.php:322 ../../include/identity.php:1123
+#: ../../include/identity.php:1199
 msgid "g A l F d"
 msgstr "G:i, l d F"
 
-#: ../../Zotlabs/Module/Ping.php:345 ../../include/identity.php:1162
-#: ../../include/identity.php:1232
+#: ../../Zotlabs/Module/Ping.php:345 ../../include/identity.php:1169
+#: ../../include/identity.php:1239
 msgid "[today]"
 msgstr "[vandaag]"
 
@@ -4308,8 +4254,8 @@ msgstr "[vandaag]"
 msgid "posted an event"
 msgstr "plaatste een gebeurtenis"
 
-#: ../../Zotlabs/Module/Poke.php:168 ../../include/apps.php:145
-#: ../../include/conversation.php:965
+#: ../../Zotlabs/Module/Poke.php:168 ../../include/conversation.php:965
+#: ../../include/apps.php:177
 msgid "Poke"
 msgstr "Aanstoten"
 
@@ -4438,7 +4384,7 @@ msgid "View this profile"
 msgstr "Profiel weergeven"
 
 #: ../../Zotlabs/Module/Profiles.php:693 ../../Zotlabs/Module/Profiles.php:775
-#: ../../include/identity.php:952
+#: ../../include/identity.php:959
 msgid "Edit visibility"
 msgstr "Zichtbaarheid bewerken"
 
@@ -4450,7 +4396,7 @@ msgstr "Hulpmiddelen"
 msgid "Change cover photo"
 msgstr "Omslagfoto wijzigen"
 
-#: ../../Zotlabs/Module/Profiles.php:696 ../../include/identity.php:923
+#: ../../Zotlabs/Module/Profiles.php:696 ../../include/identity.php:930
 msgid "Change profile photo"
 msgstr "Profielfoto veranderen"
 
@@ -4470,8 +4416,8 @@ msgstr "Dit profiel verwijderen"
 msgid "Add profile things"
 msgstr "Dingen aan je profiel toevoegen"
 
-#: ../../Zotlabs/Module/Profiles.php:701 ../../include/conversation.php:1544
-#: ../../include/widgets.php:105
+#: ../../Zotlabs/Module/Profiles.php:701 ../../include/widgets.php:105
+#: ../../include/conversation.php:1532
 msgid "Personal"
 msgstr "Persoonlijk"
 
@@ -4611,11 +4557,11 @@ msgstr "Contactinformatie en sociale netwerken"
 msgid "My other channels"
 msgstr "Mijn andere kanalen"
 
-#: ../../Zotlabs/Module/Profiles.php:771 ../../include/identity.php:948
+#: ../../Zotlabs/Module/Profiles.php:771 ../../include/identity.php:955
 msgid "Profile Image"
 msgstr "Profielfoto"
 
-#: ../../Zotlabs/Module/Profiles.php:781 ../../include/identity.php:930
+#: ../../Zotlabs/Module/Profiles.php:781 ../../include/identity.php:937
 #: ../../include/nav.php:88
 msgid "Edit Profiles"
 msgstr "Bewerk profielen"
@@ -4628,8 +4574,7 @@ msgstr "Ongeldige profiel-identificator"
 msgid "Profile Visibility Editor"
 msgstr "Zichtbaarheid profiel "
 
-#: ../../Zotlabs/Module/Profperm.php:117 ../../include/identity.php:1388
-#: ../../include/apps.php:138
+#: ../../Zotlabs/Module/Profperm.php:117 ../../include/identity.php:1395
 msgid "Profile"
 msgstr "Profiel"
 
@@ -4641,7 +4586,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:1222
+#: ../../Zotlabs/Module/Pubsites.php:22 ../../include/widgets.php:1271
 msgid "Public Hubs"
 msgstr "Openbare hubs"
 
@@ -4868,7 +4813,7 @@ msgid ""
 msgstr "Standaard worden alleen de kanalen die zich op deze hub bevinden uit het $Projectname-netwerk verwijderd"
 
 #: ../../Zotlabs/Module/Removeaccount.php:65
-#: ../../Zotlabs/Module/Settings.php:703
+#: ../../Zotlabs/Module/Settings.php:705
 msgid "Remove Account"
 msgstr "Account verwijderen"
 
@@ -4896,7 +4841,7 @@ msgid ""
 "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:1122
+#: ../../Zotlabs/Module/Removeme.php:65 ../../Zotlabs/Module/Settings.php:1124
 msgid "Remove Channel"
 msgstr "Kanaal verwijderen"
 
@@ -4940,598 +4885,598 @@ msgstr "Zoekresultaten voor %s"
 msgid "No service class restrictions found."
 msgstr "Geen abonnementsbeperkingen gevonden."
 
-#: ../../Zotlabs/Module/Settings.php:67
+#: ../../Zotlabs/Module/Settings.php:69
 msgid "Name is required"
 msgstr "Naam is vereist"
 
-#: ../../Zotlabs/Module/Settings.php:71
+#: ../../Zotlabs/Module/Settings.php:73
 msgid "Key and Secret are required"
 msgstr "Key en secret zijn vereist"
 
-#: ../../Zotlabs/Module/Settings.php:75 ../../Zotlabs/Module/Settings.php:614
-#: ../../include/apps.php:252
-msgid "Update"
-msgstr "Bijwerken"
-
-#: ../../Zotlabs/Module/Settings.php:223
+#: ../../Zotlabs/Module/Settings.php:225
 msgid "Not valid email."
 msgstr "Geen geldig e-mailadres."
 
-#: ../../Zotlabs/Module/Settings.php:226
+#: ../../Zotlabs/Module/Settings.php:228
 msgid "Protected email address. Cannot change to that email."
 msgstr "Beschermd e-mailadres. Kan dat e-mailadres niet gebruiken."
 
-#: ../../Zotlabs/Module/Settings.php:235
+#: ../../Zotlabs/Module/Settings.php:237
 msgid "System failure storing new email. Please try again."
 msgstr "Systeemfout opslaan van nieuwe e-mail. Probeer het nog een keer."
 
-#: ../../Zotlabs/Module/Settings.php:252
+#: ../../Zotlabs/Module/Settings.php:254
 msgid "Password verification failed."
 msgstr "Wachtwoordverificatie mislukt"
 
-#: ../../Zotlabs/Module/Settings.php:259
+#: ../../Zotlabs/Module/Settings.php:261
 msgid "Passwords do not match. Password unchanged."
 msgstr "Wachtwoorden komen niet overeen. Wachtwoord onveranderd."
 
-#: ../../Zotlabs/Module/Settings.php:263
+#: ../../Zotlabs/Module/Settings.php:265
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr "Lege wachtwoorden zijn niet toegestaan. Wachtwoord onveranderd."
 
-#: ../../Zotlabs/Module/Settings.php:277
+#: ../../Zotlabs/Module/Settings.php:279
 msgid "Password changed."
 msgstr "Wachtwoord veranderd."
 
-#: ../../Zotlabs/Module/Settings.php:279
+#: ../../Zotlabs/Module/Settings.php:281
 msgid "Password update failed. Please try again."
 msgstr "Bijwerken wachtwoord mislukt. Probeer opnieuw."
 
-#: ../../Zotlabs/Module/Settings.php:523
+#: ../../Zotlabs/Module/Settings.php:525
 msgid "Settings updated."
 msgstr "Instellingen bijgewerkt."
 
-#: ../../Zotlabs/Module/Settings.php:587 ../../Zotlabs/Module/Settings.php:613
-#: ../../Zotlabs/Module/Settings.php:649
+#: ../../Zotlabs/Module/Settings.php:589 ../../Zotlabs/Module/Settings.php:615
+#: ../../Zotlabs/Module/Settings.php:651
 msgid "Add application"
 msgstr "Applicatie toevoegen"
 
-#: ../../Zotlabs/Module/Settings.php:590
+#: ../../Zotlabs/Module/Settings.php:592
 msgid "Name of application"
 msgstr "Naam van applicatie"
 
-#: ../../Zotlabs/Module/Settings.php:591 ../../Zotlabs/Module/Settings.php:617
+#: ../../Zotlabs/Module/Settings.php:593 ../../Zotlabs/Module/Settings.php:619
 msgid "Consumer Key"
 msgstr "Consumer key"
 
-#: ../../Zotlabs/Module/Settings.php:591 ../../Zotlabs/Module/Settings.php:592
+#: ../../Zotlabs/Module/Settings.php:593 ../../Zotlabs/Module/Settings.php:594
 msgid "Automatically generated - change if desired. Max length 20"
 msgstr "Automatische gegenereerd - verander wanneer gewenst. Maximale lengte is 20"
 
-#: ../../Zotlabs/Module/Settings.php:592 ../../Zotlabs/Module/Settings.php:618
+#: ../../Zotlabs/Module/Settings.php:594 ../../Zotlabs/Module/Settings.php:620
 msgid "Consumer Secret"
 msgstr "Consumer secret"
 
-#: ../../Zotlabs/Module/Settings.php:593 ../../Zotlabs/Module/Settings.php:619
+#: ../../Zotlabs/Module/Settings.php:595 ../../Zotlabs/Module/Settings.php:621
 msgid "Redirect"
 msgstr "Redirect/doorverwijzing"
 
-#: ../../Zotlabs/Module/Settings.php:593
+#: ../../Zotlabs/Module/Settings.php:595
 msgid ""
 "Redirect URI - leave blank unless your application specifically requires "
 "this"
 msgstr "URI voor redirect - laat leeg, behalve wanneer de applicatie dit vereist"
 
-#: ../../Zotlabs/Module/Settings.php:594 ../../Zotlabs/Module/Settings.php:620
+#: ../../Zotlabs/Module/Settings.php:596 ../../Zotlabs/Module/Settings.php:622
 msgid "Icon url"
 msgstr "Pictogram-URL"
 
-#: ../../Zotlabs/Module/Settings.php:594
+#: ../../Zotlabs/Module/Settings.php:596 ../../Zotlabs/Module/Sources.php:112
+#: ../../Zotlabs/Module/Sources.php:147
 msgid "Optional"
 msgstr "Optioneel"
 
-#: ../../Zotlabs/Module/Settings.php:605
+#: ../../Zotlabs/Module/Settings.php:607
 msgid "Application not found."
 msgstr "Applicatie niet gevonden."
 
-#: ../../Zotlabs/Module/Settings.php:648
+#: ../../Zotlabs/Module/Settings.php:650
 msgid "Connected Apps"
 msgstr "Verbonden applicaties"
 
-#: ../../Zotlabs/Module/Settings.php:652
+#: ../../Zotlabs/Module/Settings.php:654
 msgid "Client key starts with"
 msgstr "Client key begint met"
 
-#: ../../Zotlabs/Module/Settings.php:653
+#: ../../Zotlabs/Module/Settings.php:655
 msgid "No name"
 msgstr "Geen naam"
 
-#: ../../Zotlabs/Module/Settings.php:654
+#: ../../Zotlabs/Module/Settings.php:656
 msgid "Remove authorization"
 msgstr "Autorisatie verwijderen"
 
-#: ../../Zotlabs/Module/Settings.php:667
+#: ../../Zotlabs/Module/Settings.php:669
 msgid "No feature settings configured"
 msgstr "Geen plugin-instellingen aanwezig"
 
-#: ../../Zotlabs/Module/Settings.php:674
+#: ../../Zotlabs/Module/Settings.php:676
 msgid "Feature/Addon Settings"
 msgstr "Plugin-instellingen"
 
-#: ../../Zotlabs/Module/Settings.php:697
+#: ../../Zotlabs/Module/Settings.php:699
 msgid "Account Settings"
 msgstr "Account-instellingen"
 
-#: ../../Zotlabs/Module/Settings.php:698
+#: ../../Zotlabs/Module/Settings.php:700
 msgid "Current Password"
 msgstr "Huidig wachtwoord"
 
-#: ../../Zotlabs/Module/Settings.php:699
+#: ../../Zotlabs/Module/Settings.php:701
 msgid "Enter New Password"
 msgstr "Nieuw wachtwoord invoeren"
 
-#: ../../Zotlabs/Module/Settings.php:700
+#: ../../Zotlabs/Module/Settings.php:702
 msgid "Confirm New Password"
 msgstr "Nieuw wachtwoord bevestigen"
 
-#: ../../Zotlabs/Module/Settings.php:700
+#: ../../Zotlabs/Module/Settings.php:702
 msgid "Leave password fields blank unless changing"
 msgstr "Laat de wachtwoordvelden leeg, behalve wanneer je deze wil veranderen"
 
-#: ../../Zotlabs/Module/Settings.php:702
-#: ../../Zotlabs/Module/Settings.php:1039
+#: ../../Zotlabs/Module/Settings.php:704
+#: ../../Zotlabs/Module/Settings.php:1041
 msgid "Email Address:"
 msgstr "E-mailadres:"
 
-#: ../../Zotlabs/Module/Settings.php:704
+#: ../../Zotlabs/Module/Settings.php:706
 msgid "Remove this account including all its channels"
 msgstr "Dit account en al zijn kanalen verwijderen"
 
-#: ../../Zotlabs/Module/Settings.php:727
+#: ../../Zotlabs/Module/Settings.php:729
 msgid "Additional Features"
 msgstr "Extra functies"
 
-#: ../../Zotlabs/Module/Settings.php:751
+#: ../../Zotlabs/Module/Settings.php:753
 msgid "Connector Settings"
 msgstr "Instellingen externe koppelingen"
 
-#: ../../Zotlabs/Module/Settings.php:790
+#: ../../Zotlabs/Module/Settings.php:792
 msgid "No special theme for mobile devices"
 msgstr "Geen speciaal thema voor mobiele apparaten"
 
-#: ../../Zotlabs/Module/Settings.php:793
+#: ../../Zotlabs/Module/Settings.php:795
 #, php-format
 msgid "%s - (Experimental)"
 msgstr "%s - (experimenteel)"
 
-#: ../../Zotlabs/Module/Settings.php:835
+#: ../../Zotlabs/Module/Settings.php:837
 msgid "Display Settings"
 msgstr "Weergave-instellingen"
 
-#: ../../Zotlabs/Module/Settings.php:836
+#: ../../Zotlabs/Module/Settings.php:838
 msgid "Theme Settings"
 msgstr "Thema-instellingen"
 
-#: ../../Zotlabs/Module/Settings.php:837
+#: ../../Zotlabs/Module/Settings.php:839
 msgid "Custom Theme Settings"
 msgstr "Handmatige thema-instellingen"
 
-#: ../../Zotlabs/Module/Settings.php:838
+#: ../../Zotlabs/Module/Settings.php:840
 msgid "Content Settings"
 msgstr "Inhoudsinstellingen"
 
-#: ../../Zotlabs/Module/Settings.php:844
+#: ../../Zotlabs/Module/Settings.php:846
 msgid "Display Theme:"
 msgstr "Gebruik thema:"
 
-#: ../../Zotlabs/Module/Settings.php:845
+#: ../../Zotlabs/Module/Settings.php:847
 msgid "Mobile Theme:"
 msgstr "Mobiel thema:"
 
-#: ../../Zotlabs/Module/Settings.php:846
+#: ../../Zotlabs/Module/Settings.php:848
 msgid "Preload images before rendering the page"
 msgstr "Afbeeldingen laden voordat de pagina wordt weergegeven"
 
-#: ../../Zotlabs/Module/Settings.php:846
+#: ../../Zotlabs/Module/Settings.php:848
 msgid ""
 "The subjective page load time will be longer but the page will be ready when"
 " displayed"
 msgstr "De laadtijd van een pagina lijkt langer, maar de pagina is wel meteen helemaal geladen wanneer deze wordt weergeven"
 
-#: ../../Zotlabs/Module/Settings.php:847
+#: ../../Zotlabs/Module/Settings.php:849
 msgid "Enable user zoom on mobile devices"
 msgstr "Inzoomen op smartphones en tablets toestaan"
 
-#: ../../Zotlabs/Module/Settings.php:848
+#: ../../Zotlabs/Module/Settings.php:850
 msgid "Update browser every xx seconds"
 msgstr "Ververs de webbrowser om de zoveel seconde"
 
-#: ../../Zotlabs/Module/Settings.php:848
+#: ../../Zotlabs/Module/Settings.php:850
 msgid "Minimum of 10 seconds, no maximum"
 msgstr "Minimaal 10 seconde, geen maximum"
 
-#: ../../Zotlabs/Module/Settings.php:849
+#: ../../Zotlabs/Module/Settings.php:851
 msgid "Maximum number of conversations to load at any time:"
 msgstr "Maximaal aantal conversaties die per keer geladen worden:"
 
-#: ../../Zotlabs/Module/Settings.php:849
+#: ../../Zotlabs/Module/Settings.php:851
 msgid "Maximum of 100 items"
 msgstr "Maximaal 100 conversaties"
 
-#: ../../Zotlabs/Module/Settings.php:850
+#: ../../Zotlabs/Module/Settings.php:852
 msgid "Show emoticons (smilies) as images"
 msgstr "Toon emoticons (smilies) als afbeeldingen"
 
-#: ../../Zotlabs/Module/Settings.php:851
+#: ../../Zotlabs/Module/Settings.php:853
 msgid "Link post titles to source"
 msgstr "Berichtkoppen naar originele locatie linken"
 
-#: ../../Zotlabs/Module/Settings.php:852
+#: ../../Zotlabs/Module/Settings.php:854
 msgid "System Page Layout Editor - (advanced)"
 msgstr "Lay-out bewerken van systeempagina's (geavanceerd)"
 
-#: ../../Zotlabs/Module/Settings.php:855
+#: ../../Zotlabs/Module/Settings.php:857
 msgid "Use blog/list mode on channel page"
 msgstr "Gebruik blog/lijst-modus op kanaalpagina"
 
-#: ../../Zotlabs/Module/Settings.php:855 ../../Zotlabs/Module/Settings.php:856
+#: ../../Zotlabs/Module/Settings.php:857 ../../Zotlabs/Module/Settings.php:858
 msgid "(comments displayed separately)"
 msgstr "(reacties worden afzonderlijk weergeven)"
 
-#: ../../Zotlabs/Module/Settings.php:856
+#: ../../Zotlabs/Module/Settings.php:858
 msgid "Use blog/list mode on grid page"
 msgstr "Gebruik blog/lijst-modus op gridpagina"
 
-#: ../../Zotlabs/Module/Settings.php:857
+#: ../../Zotlabs/Module/Settings.php:859
 msgid "Channel page max height of content (in pixels)"
 msgstr "Maximale hoogte berichtinhoud op kanaalpagina (in pixels)"
 
-#: ../../Zotlabs/Module/Settings.php:857 ../../Zotlabs/Module/Settings.php:858
+#: ../../Zotlabs/Module/Settings.php:859 ../../Zotlabs/Module/Settings.php:860
 msgid "click to expand content exceeding this height"
 msgstr "klik om inhoud uit te klappen die deze hoogte overschrijdt"
 
-#: ../../Zotlabs/Module/Settings.php:858
+#: ../../Zotlabs/Module/Settings.php:860
 msgid "Grid page max height of content (in pixels)"
 msgstr "Maximale hoogte berichtinhoud op gridpagina (in pixels)"
 
-#: ../../Zotlabs/Module/Settings.php:892
+#: ../../Zotlabs/Module/Settings.php:894
 msgid "Nobody except yourself"
 msgstr "Niemand, behalve jezelf"
 
-#: ../../Zotlabs/Module/Settings.php:893
+#: ../../Zotlabs/Module/Settings.php:895
 msgid "Only those you specifically allow"
 msgstr "Alleen connecties met uitdrukkelijke toestemming"
 
-#: ../../Zotlabs/Module/Settings.php:894
+#: ../../Zotlabs/Module/Settings.php:896
 msgid "Approved connections"
 msgstr "Geaccepteerde connecties"
 
-#: ../../Zotlabs/Module/Settings.php:895
+#: ../../Zotlabs/Module/Settings.php:897
 msgid "Any connections"
 msgstr "Alle connecties"
 
-#: ../../Zotlabs/Module/Settings.php:896
+#: ../../Zotlabs/Module/Settings.php:898
 msgid "Anybody on this website"
 msgstr "Iedereen op deze hub"
 
-#: ../../Zotlabs/Module/Settings.php:897
+#: ../../Zotlabs/Module/Settings.php:899
 msgid "Anybody in this network"
 msgstr "Iedereen in dit netwerk"
 
-#: ../../Zotlabs/Module/Settings.php:898
+#: ../../Zotlabs/Module/Settings.php:900
 msgid "Anybody authenticated"
 msgstr "Geauthenticeerd"
 
-#: ../../Zotlabs/Module/Settings.php:899
+#: ../../Zotlabs/Module/Settings.php:901
 msgid "Anybody on the internet"
 msgstr "Iedereen op het internet"
 
-#: ../../Zotlabs/Module/Settings.php:974
+#: ../../Zotlabs/Module/Settings.php:976
 msgid "Publish your default profile in the network directory"
 msgstr "Publiceer je standaardprofiel in de kanalengids"
 
-#: ../../Zotlabs/Module/Settings.php:979
+#: ../../Zotlabs/Module/Settings.php:981
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr "Sta ons toe om jouw kanaal als mogelijke connectie voor te stellen aan nieuwe kanalen"
 
-#: ../../Zotlabs/Module/Settings.php:988
+#: ../../Zotlabs/Module/Settings.php:990
 msgid "Your channel address is"
 msgstr "Jouw kanaaladres is"
 
-#: ../../Zotlabs/Module/Settings.php:1030
+#: ../../Zotlabs/Module/Settings.php:1032
 msgid "Channel Settings"
 msgstr "Kanaal-instellingen"
 
-#: ../../Zotlabs/Module/Settings.php:1037
+#: ../../Zotlabs/Module/Settings.php:1039
 msgid "Basic Settings"
 msgstr "Basis-instellingen"
 
-#: ../../Zotlabs/Module/Settings.php:1038 ../../include/identity.php:1279
+#: ../../Zotlabs/Module/Settings.php:1040 ../../include/identity.php:1286
 msgid "Full Name:"
 msgstr "Volledige naam:"
 
-#: ../../Zotlabs/Module/Settings.php:1040
+#: ../../Zotlabs/Module/Settings.php:1042
 msgid "Your Timezone:"
 msgstr "Jouw tijdzone:"
 
-#: ../../Zotlabs/Module/Settings.php:1041
+#: ../../Zotlabs/Module/Settings.php:1043
 msgid "Default Post Location:"
 msgstr "Standaardlocatie bericht:"
 
-#: ../../Zotlabs/Module/Settings.php:1041
+#: ../../Zotlabs/Module/Settings.php:1043
 msgid "Geographical location to display on your posts"
 msgstr "Geografische locatie die bij het bericht moet worden vermeld"
 
-#: ../../Zotlabs/Module/Settings.php:1042
+#: ../../Zotlabs/Module/Settings.php:1044
 msgid "Use Browser Location:"
 msgstr "Locatie van webbrowser gebruiken:"
 
-#: ../../Zotlabs/Module/Settings.php:1044
+#: ../../Zotlabs/Module/Settings.php:1046
 msgid "Adult Content"
 msgstr "Inhoud voor volwassenen"
 
-#: ../../Zotlabs/Module/Settings.php:1044
+#: ../../Zotlabs/Module/Settings.php:1046
 msgid ""
 "This channel frequently or regularly publishes adult content. (Please tag "
 "any adult material and/or nudity with #NSFW)"
 msgstr "Dit kanaal publiceert regelmatig of vaak materiaal dat alleen geschikt is voor volwassenen. (Gebruik de tag #NSFW in berichten met een seksueel getinte inhoud of ander voor minderjarigen ongeschikt materiaal)"
 
-#: ../../Zotlabs/Module/Settings.php:1046
+#: ../../Zotlabs/Module/Settings.php:1048
 msgid "Security and Privacy Settings"
 msgstr "Veiligheids- en privacy-instellingen"
 
-#: ../../Zotlabs/Module/Settings.php:1049
+#: ../../Zotlabs/Module/Settings.php:1051
 msgid "Your permissions are already configured. Click to view/adjust"
 msgstr "Jouw permissies zijn al ingesteld. Klik om ze te bekijken of aan te passen."
 
-#: ../../Zotlabs/Module/Settings.php:1051
+#: ../../Zotlabs/Module/Settings.php:1053
 msgid "Hide my online presence"
 msgstr "Verberg mijn aanwezigheid"
 
-#: ../../Zotlabs/Module/Settings.php:1051
+#: ../../Zotlabs/Module/Settings.php:1053
 msgid "Prevents displaying in your profile that you are online"
 msgstr "Voorkomt dat op je kanaalpagina te zien valt dat je momenteel op $Projectname aanwezig bent"
 
-#: ../../Zotlabs/Module/Settings.php:1053
+#: ../../Zotlabs/Module/Settings.php:1055
 msgid "Simple Privacy Settings:"
 msgstr "Eenvoudige privacy-instellingen:"
 
-#: ../../Zotlabs/Module/Settings.php:1054
+#: ../../Zotlabs/Module/Settings.php:1056
 msgid ""
 "Very Public - <em>extremely permissive (should be used with caution)</em>"
 msgstr "Zeer openbaar <em>(kanaal staat volledig open - moet met grote zorgvuldigheid gebruikt worden)</em>"
 
-#: ../../Zotlabs/Module/Settings.php:1055
+#: ../../Zotlabs/Module/Settings.php:1057
 msgid ""
 "Typical - <em>default public, privacy when desired (similar to social "
 "network permissions but with improved privacy)</em>"
 msgstr "Normaal <em>(standaard openbaar, maar privacy wanneer noodzakelijk - vergelijkbaar met die van sociale netwerken, maar met verbeterde privacy)</em>"
 
-#: ../../Zotlabs/Module/Settings.php:1056
+#: ../../Zotlabs/Module/Settings.php:1058
 msgid "Private - <em>default private, never open or public</em>"
 msgstr "Privé <em>(standaard privé en nooit openbaar)</em>"
 
-#: ../../Zotlabs/Module/Settings.php:1057
+#: ../../Zotlabs/Module/Settings.php:1059
 msgid "Blocked - <em>default blocked to/from everybody</em>"
 msgstr "Geblokkeerd <em>(standaard geblokkeerd naar/van iedereen)</em>"
 
-#: ../../Zotlabs/Module/Settings.php:1059
+#: ../../Zotlabs/Module/Settings.php:1061
 msgid "Allow others to tag your posts"
 msgstr "Anderen toestaan om je berichten te taggen"
 
-#: ../../Zotlabs/Module/Settings.php:1059
+#: ../../Zotlabs/Module/Settings.php:1061
 msgid ""
 "Often used by the community to retro-actively flag inappropriate content"
 msgstr "Vaak in groepen/forums gebruikt om met terugwerkende kracht ongepast materiaal te markeren"
 
-#: ../../Zotlabs/Module/Settings.php:1061
+#: ../../Zotlabs/Module/Settings.php:1063
 msgid "Advanced Privacy Settings"
 msgstr "Geavanceerde privacy-instellingen"
 
-#: ../../Zotlabs/Module/Settings.php:1063
+#: ../../Zotlabs/Module/Settings.php:1065
 msgid "Expire other channel content after this many days"
 msgstr "Inhoud van andere kanalen na zoveel aantal dagen laten verlopen:"
 
-#: ../../Zotlabs/Module/Settings.php:1063
+#: ../../Zotlabs/Module/Settings.php:1065
 #, php-format
 msgid ""
 "0 or blank to use the website limit. The website expires after %d days."
 msgstr "0 of leeg om het standaard aantal dagen van deze hub te gebruiken. Deze hub laat de inhoud van andere kanalen na %d dagen verlopen."
 
-#: ../../Zotlabs/Module/Settings.php:1064
+#: ../../Zotlabs/Module/Settings.php:1066
 msgid "Maximum Friend Requests/Day:"
 msgstr "Maximum aantal connectieverzoeken per dag:"
 
-#: ../../Zotlabs/Module/Settings.php:1064
+#: ../../Zotlabs/Module/Settings.php:1066
 msgid "May reduce spam activity"
 msgstr "Kan eventuele spam verminderen"
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Zotlabs/Module/Settings.php:1067
 msgid "Default Post Permissions"
 msgstr "Standaard permissies voor nieuwe berichten"
 
-#: ../../Zotlabs/Module/Settings.php:1070
+#: ../../Zotlabs/Module/Settings.php:1069
+msgid "Use my default audience setting for the type of post"
+msgstr "Gebruik van mijn standaard privacy-instelling voor berichten"
+
+#: ../../Zotlabs/Module/Settings.php:1072
 msgid "Channel permissions category:"
 msgstr "Kanaaltype en -permissies:"
 
-#: ../../Zotlabs/Module/Settings.php:1076
+#: ../../Zotlabs/Module/Settings.php:1078
 msgid "Maximum private messages per day from unknown people:"
 msgstr "Maximum aantal privé-berichten per dag van onbekende personen:"
 
-#: ../../Zotlabs/Module/Settings.php:1076
+#: ../../Zotlabs/Module/Settings.php:1078
 msgid "Useful to reduce spamming"
 msgstr "Kan eventuele spam verminderen"
 
-#: ../../Zotlabs/Module/Settings.php:1079
+#: ../../Zotlabs/Module/Settings.php:1081
 msgid "Notification Settings"
 msgstr "Notificatie-instellingen"
 
-#: ../../Zotlabs/Module/Settings.php:1080
+#: ../../Zotlabs/Module/Settings.php:1082
 msgid "By default post a status message when:"
-msgstr "Plaats automatisch een statusbericht wanneer:"
+msgstr "Plaats automatisch een bericht wanneer:"
 
-#: ../../Zotlabs/Module/Settings.php:1081
+#: ../../Zotlabs/Module/Settings.php:1083
 msgid "accepting a friend request"
 msgstr "Een connectieverzoek wordt geaccepteerd"
 
-#: ../../Zotlabs/Module/Settings.php:1082
+#: ../../Zotlabs/Module/Settings.php:1084
 msgid "joining a forum/community"
 msgstr "Je lid wordt van een forum/groep"
 
-#: ../../Zotlabs/Module/Settings.php:1083
+#: ../../Zotlabs/Module/Settings.php:1085
 msgid "making an <em>interesting</em> profile change"
 msgstr "Er sprake is van een <em>interessante</em> profielwijziging"
 
-#: ../../Zotlabs/Module/Settings.php:1084
+#: ../../Zotlabs/Module/Settings.php:1086
 msgid "Send a notification email when:"
 msgstr "Verzend een notificatie per e-mail wanneer:"
 
-#: ../../Zotlabs/Module/Settings.php:1085
+#: ../../Zotlabs/Module/Settings.php:1087
 msgid "You receive a connection request"
 msgstr "Je een connectieverzoek ontvangt"
 
-#: ../../Zotlabs/Module/Settings.php:1086
+#: ../../Zotlabs/Module/Settings.php:1088
 msgid "Your connections are confirmed"
 msgstr "Jouw connecties zijn bevestigd"
 
-#: ../../Zotlabs/Module/Settings.php:1087
+#: ../../Zotlabs/Module/Settings.php:1089
 msgid "Someone writes on your profile wall"
 msgstr "Iemand iets op jouw kanaal heeft geschreven"
 
-#: ../../Zotlabs/Module/Settings.php:1088
+#: ../../Zotlabs/Module/Settings.php:1090
 msgid "Someone writes a followup comment"
 msgstr "Iemand een reactie schrijft"
 
-#: ../../Zotlabs/Module/Settings.php:1089
+#: ../../Zotlabs/Module/Settings.php:1091
 msgid "You receive a private message"
 msgstr "Je een privé-bericht ontvangt"
 
-#: ../../Zotlabs/Module/Settings.php:1090
+#: ../../Zotlabs/Module/Settings.php:1092
 msgid "You receive a friend suggestion"
 msgstr "Je een kanaalvoorstel ontvangt"
 
-#: ../../Zotlabs/Module/Settings.php:1091
+#: ../../Zotlabs/Module/Settings.php:1093
 msgid "You are tagged in a post"
 msgstr "Je expliciet in een bericht bent genoemd"
 
-#: ../../Zotlabs/Module/Settings.php:1092
+#: ../../Zotlabs/Module/Settings.php:1094
 msgid "You are poked/prodded/etc. in a post"
 msgstr "Je bent in een bericht aangestoten/gepord/etc."
 
-#: ../../Zotlabs/Module/Settings.php:1095
+#: ../../Zotlabs/Module/Settings.php:1097
 msgid "Show visual notifications including:"
 msgstr "Toon de volgende zichtbare notificaties:"
 
-#: ../../Zotlabs/Module/Settings.php:1097
+#: ../../Zotlabs/Module/Settings.php:1099
 msgid "Unseen grid activity"
 msgstr "Niet bekeken grid-activiteit"
 
-#: ../../Zotlabs/Module/Settings.php:1098
+#: ../../Zotlabs/Module/Settings.php:1100
 msgid "Unseen channel activity"
 msgstr "Niet bekeken kanaal-activiteit"
 
-#: ../../Zotlabs/Module/Settings.php:1099
+#: ../../Zotlabs/Module/Settings.php:1101
 msgid "Unseen private messages"
 msgstr "Niet bekeken privéberichten"
 
-#: ../../Zotlabs/Module/Settings.php:1099
-#: ../../Zotlabs/Module/Settings.php:1104
-#: ../../Zotlabs/Module/Settings.php:1105
+#: ../../Zotlabs/Module/Settings.php:1101
 #: ../../Zotlabs/Module/Settings.php:1106
+#: ../../Zotlabs/Module/Settings.php:1107
+#: ../../Zotlabs/Module/Settings.php:1108
 msgid "Recommended"
 msgstr "Aanbevolen"
 
-#: ../../Zotlabs/Module/Settings.php:1100
+#: ../../Zotlabs/Module/Settings.php:1102
 msgid "Upcoming events"
 msgstr "Aankomende gebeurtenissen"
 
-#: ../../Zotlabs/Module/Settings.php:1101
+#: ../../Zotlabs/Module/Settings.php:1103
 msgid "Events today"
 msgstr "Gebeurtenissen van vandaag"
 
-#: ../../Zotlabs/Module/Settings.php:1102
+#: ../../Zotlabs/Module/Settings.php:1104
 msgid "Upcoming birthdays"
 msgstr "Aankomende verjaardagen"
 
-#: ../../Zotlabs/Module/Settings.php:1102
+#: ../../Zotlabs/Module/Settings.php:1104
 msgid "Not available in all themes"
 msgstr "Niet in alle thema's beschikbaar"
 
-#: ../../Zotlabs/Module/Settings.php:1103
+#: ../../Zotlabs/Module/Settings.php:1105
 msgid "System (personal) notifications"
 msgstr "(Persoonlijke) systeemnotificaties"
 
-#: ../../Zotlabs/Module/Settings.php:1104
+#: ../../Zotlabs/Module/Settings.php:1106
 msgid "System info messages"
 msgstr "Systeemmededelingen"
 
-#: ../../Zotlabs/Module/Settings.php:1105
+#: ../../Zotlabs/Module/Settings.php:1107
 msgid "System critical alerts"
 msgstr "Kritische systeemwaarschuwingen"
 
-#: ../../Zotlabs/Module/Settings.php:1106
+#: ../../Zotlabs/Module/Settings.php:1108
 msgid "New connections"
 msgstr "Nieuwe connecties"
 
-#: ../../Zotlabs/Module/Settings.php:1107
+#: ../../Zotlabs/Module/Settings.php:1109
 msgid "System Registrations"
 msgstr "Nieuwe accountregistraties op deze hub"
 
-#: ../../Zotlabs/Module/Settings.php:1108
+#: ../../Zotlabs/Module/Settings.php:1110
 msgid ""
 "Also show new wall posts, private messages and connections under Notices"
 msgstr "Toon tevens nieuwe kanaalberichten, privéberichten en connecties onder Notificaties"
 
-#: ../../Zotlabs/Module/Settings.php:1110
+#: ../../Zotlabs/Module/Settings.php:1112
 msgid "Notify me of events this many days in advance"
 msgstr "Herinner mij zoveel dagen van te voren aan gebeurtenissen"
 
-#: ../../Zotlabs/Module/Settings.php:1110
+#: ../../Zotlabs/Module/Settings.php:1112
 msgid "Must be greater than 0"
 msgstr "Moet hoger dan 0 zijn"
 
-#: ../../Zotlabs/Module/Settings.php:1112
+#: ../../Zotlabs/Module/Settings.php:1114
 msgid "Advanced Account/Page Type Settings"
 msgstr "Instellingen geavanceerd account/paginatype"
 
-#: ../../Zotlabs/Module/Settings.php:1113
+#: ../../Zotlabs/Module/Settings.php:1115
 msgid "Change the behaviour of this account for special situations"
 msgstr "Verander het gedrag van dit account voor speciale situaties"
 
-#: ../../Zotlabs/Module/Settings.php:1116
+#: ../../Zotlabs/Module/Settings.php:1118
 msgid ""
 "Please enable expert mode (in <a href=\"settings/features\">Settings > "
 "Additional features</a>) to adjust!"
 msgstr "Schakel de expertmodus in (in <a href=\"settings/features\">Instellingen > Extra functies</a>) om aan te kunnen passen!"
 
-#: ../../Zotlabs/Module/Settings.php:1117
+#: ../../Zotlabs/Module/Settings.php:1119
 msgid "Miscellaneous Settings"
 msgstr "Diverse instellingen"
 
-#: ../../Zotlabs/Module/Settings.php:1118
+#: ../../Zotlabs/Module/Settings.php:1120
 msgid "Default photo upload folder"
 msgstr "Standaard fotoalbum voor uploads"
 
-#: ../../Zotlabs/Module/Settings.php:1118
-#: ../../Zotlabs/Module/Settings.php:1119
+#: ../../Zotlabs/Module/Settings.php:1120
+#: ../../Zotlabs/Module/Settings.php:1121
 msgid "%Y - current year, %m -  current month"
 msgstr "%Y - dit jaar, %m -  deze maand"
 
-#: ../../Zotlabs/Module/Settings.php:1119
+#: ../../Zotlabs/Module/Settings.php:1121
 msgid "Default file upload folder"
 msgstr "Standaard bestandsmap voor uploads"
 
-#: ../../Zotlabs/Module/Settings.php:1121
+#: ../../Zotlabs/Module/Settings.php:1123
 msgid "Personal menu to display in your channel pages"
 msgstr "Persoonlijk menu om op je kanaalpagina's weer te geven"
 
-#: ../../Zotlabs/Module/Settings.php:1123
+#: ../../Zotlabs/Module/Settings.php:1125
 msgid "Remove this channel."
 msgstr "Verwijder dit kanaal."
 
-#: ../../Zotlabs/Module/Settings.php:1124
+#: ../../Zotlabs/Module/Settings.php:1126
 msgid "Firefox Share $Projectname provider"
 msgstr "$Projectname-service voor Firefox Share"
 
-#: ../../Zotlabs/Module/Settings.php:1125
+#: ../../Zotlabs/Module/Settings.php:1127
 msgid "Start calendar week on monday"
 msgstr "Begin in de agenda de week op maandag"
 
@@ -5564,7 +5509,7 @@ msgid ""
 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:739
+#: ../../Zotlabs/Module/Setup.php:744
 msgid "Please see the file \"install/INSTALL.txt\"."
 msgstr "Please see the file \"install/INSTALL.txt\"."
 
@@ -5666,289 +5611,297 @@ msgid ""
 "proficient audiences"
 msgstr "Some advanced features, while useful - may be best suited for technically proficient audiences"
 
-#: ../../Zotlabs/Module/Setup.php:422
+#: ../../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:412
+msgid "PHP version"
+msgstr "PHP version"
+
+#: ../../Zotlabs/Module/Setup.php:427
 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:423
+#: ../../Zotlabs/Module/Setup.php:428
 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:427
+#: ../../Zotlabs/Module/Setup.php:432
 msgid "PHP executable path"
 msgstr "PHP executable path"
 
-#: ../../Zotlabs/Module/Setup.php:427
+#: ../../Zotlabs/Module/Setup.php:432
 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:432
+#: ../../Zotlabs/Module/Setup.php:437
 msgid "Command line PHP"
 msgstr "Command line PHP"
 
-#: ../../Zotlabs/Module/Setup.php:441
+#: ../../Zotlabs/Module/Setup.php:446
 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:442
+#: ../../Zotlabs/Module/Setup.php:447
 msgid "This is required for message delivery to work."
 msgstr "This is required for message delivery to work."
 
-#: ../../Zotlabs/Module/Setup.php:445
+#: ../../Zotlabs/Module/Setup.php:450
 msgid "PHP register_argc_argv"
 msgstr "PHP register_argc_argv"
 
-#: ../../Zotlabs/Module/Setup.php:463
+#: ../../Zotlabs/Module/Setup.php:468
 #, 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:468
+#: ../../Zotlabs/Module/Setup.php:473
 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:470
+#: ../../Zotlabs/Module/Setup.php:475
 msgid "PHP upload limits"
 msgstr "PHP upload limits"
 
-#: ../../Zotlabs/Module/Setup.php:493
+#: ../../Zotlabs/Module/Setup.php:498
 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:494
+#: ../../Zotlabs/Module/Setup.php:499
 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:497
+#: ../../Zotlabs/Module/Setup.php:502
 msgid "Generate encryption keys"
 msgstr "Generate encryption keys"
 
-#: ../../Zotlabs/Module/Setup.php:509
+#: ../../Zotlabs/Module/Setup.php:514
 msgid "libCurl PHP module"
 msgstr "libCurl PHP module"
 
-#: ../../Zotlabs/Module/Setup.php:510
+#: ../../Zotlabs/Module/Setup.php:515
 msgid "GD graphics PHP module"
 msgstr "GD graphics PHP module"
 
-#: ../../Zotlabs/Module/Setup.php:511
+#: ../../Zotlabs/Module/Setup.php:516
 msgid "OpenSSL PHP module"
 msgstr "OpenSSL PHP module"
 
-#: ../../Zotlabs/Module/Setup.php:512
+#: ../../Zotlabs/Module/Setup.php:517
 msgid "mysqli or postgres PHP module"
 msgstr "mysqli or postgres PHP module"
 
-#: ../../Zotlabs/Module/Setup.php:513
+#: ../../Zotlabs/Module/Setup.php:518
 msgid "mb_string PHP module"
 msgstr "mb_string PHP module"
 
-#: ../../Zotlabs/Module/Setup.php:514
+#: ../../Zotlabs/Module/Setup.php:519
 msgid "mcrypt PHP module"
 msgstr "mcrypt PHP module"
 
-#: ../../Zotlabs/Module/Setup.php:515
+#: ../../Zotlabs/Module/Setup.php:520
 msgid "xml PHP module"
 msgstr "xml PHP module"
 
-#: ../../Zotlabs/Module/Setup.php:519 ../../Zotlabs/Module/Setup.php:521
+#: ../../Zotlabs/Module/Setup.php:524 ../../Zotlabs/Module/Setup.php:526
 msgid "Apache mod_rewrite module"
 msgstr "Apache mod_rewrite module"
 
-#: ../../Zotlabs/Module/Setup.php:519
+#: ../../Zotlabs/Module/Setup.php:524
 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:525 ../../Zotlabs/Module/Setup.php:528
+#: ../../Zotlabs/Module/Setup.php:530 ../../Zotlabs/Module/Setup.php:533
 msgid "proc_open"
 msgstr "proc_open"
 
-#: ../../Zotlabs/Module/Setup.php:525
+#: ../../Zotlabs/Module/Setup.php:530
 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:533
+#: ../../Zotlabs/Module/Setup.php:538
 msgid "Error: libCURL PHP module required but not installed."
 msgstr "Error: libCURL PHP module required but not installed."
 
-#: ../../Zotlabs/Module/Setup.php:537
+#: ../../Zotlabs/Module/Setup.php:542
 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:541
+#: ../../Zotlabs/Module/Setup.php:546
 msgid "Error: openssl PHP module required but not installed."
 msgstr "Error: openssl PHP module required but not installed."
 
-#: ../../Zotlabs/Module/Setup.php:545
+#: ../../Zotlabs/Module/Setup.php:550
 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:549
+#: ../../Zotlabs/Module/Setup.php:554
 msgid "Error: mb_string PHP module required but not installed."
 msgstr "Error: mb_string PHP module required but not installed."
 
-#: ../../Zotlabs/Module/Setup.php:553
+#: ../../Zotlabs/Module/Setup.php:558
 msgid "Error: mcrypt PHP module required but not installed."
 msgstr "Error: mcrypt PHP module required but not installed."
 
-#: ../../Zotlabs/Module/Setup.php:557
+#: ../../Zotlabs/Module/Setup.php:562
 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:575
+#: ../../Zotlabs/Module/Setup.php:580
 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:576
+#: ../../Zotlabs/Module/Setup.php:581
 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:577
+#: ../../Zotlabs/Module/Setup.php:582
 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:578
+#: ../../Zotlabs/Module/Setup.php:583
 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:581
+#: ../../Zotlabs/Module/Setup.php:586
 msgid ".htconfig.php is writable"
 msgstr ".htconfig.php is writable"
 
-#: ../../Zotlabs/Module/Setup.php:595
+#: ../../Zotlabs/Module/Setup.php:600
 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:596
+#: ../../Zotlabs/Module/Setup.php:601
 #, 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."
 
-#: ../../Zotlabs/Module/Setup.php:597 ../../Zotlabs/Module/Setup.php:618
+#: ../../Zotlabs/Module/Setup.php:602 ../../Zotlabs/Module/Setup.php:623
 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:598
+#: ../../Zotlabs/Module/Setup.php:603
 #, 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:601
+#: ../../Zotlabs/Module/Setup.php:606
 #, php-format
 msgid "%s is writable"
 msgstr "%s is writable"
 
-#: ../../Zotlabs/Module/Setup.php:617
+#: ../../Zotlabs/Module/Setup.php:622
 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:621
+#: ../../Zotlabs/Module/Setup.php:626
 msgid "store is writable"
 msgstr "store is writable"
 
-#: ../../Zotlabs/Module/Setup.php:654
+#: ../../Zotlabs/Module/Setup.php:659
 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:655
+#: ../../Zotlabs/Module/Setup.php:660
 msgid ""
 "If you have https access to your website or allow connections to TCP port "
 "443 (the https: port), you MUST use a browser-valid certificate. You MUST "
 "NOT use self-signed certificates!"
 msgstr "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:656
+#: ../../Zotlabs/Module/Setup.php:661
 msgid ""
 "This restriction is incorporated because public posts from you may for "
 "example contain references to images on your own hub."
 msgstr "This restriction is incorporated because public posts from you may for example contain references to images on your own hub."
 
-#: ../../Zotlabs/Module/Setup.php:657
+#: ../../Zotlabs/Module/Setup.php:662
 msgid ""
 "If your certificate is not recognized, members of other sites (who may "
 "themselves have valid certificates) will get a warning message on their own "
 "site complaining about security issues."
 msgstr "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:658
+#: ../../Zotlabs/Module/Setup.php:663
 msgid ""
 "This can cause usability issues elsewhere (not just on your own site) so we "
 "must insist on this requirement."
 msgstr "This can cause usability issues elsewhere (not just on your own hub) so we must insist on this requirement."
 
-#: ../../Zotlabs/Module/Setup.php:659
+#: ../../Zotlabs/Module/Setup.php:664
 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:661
+#: ../../Zotlabs/Module/Setup.php:666
 msgid "SSL certificate validation"
 msgstr "SSL certificate validation"
 
-#: ../../Zotlabs/Module/Setup.php:667
+#: ../../Zotlabs/Module/Setup.php:672
 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:670
+#: ../../Zotlabs/Module/Setup.php:675
 msgid "Url rewrite is working"
 msgstr "Url rewrite is working"
 
-#: ../../Zotlabs/Module/Setup.php:679
+#: ../../Zotlabs/Module/Setup.php:684
 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:703
+#: ../../Zotlabs/Module/Setup.php:708
 msgid "Errors encountered creating database tables."
 msgstr "Errors encountered creating database tables."
 
-#: ../../Zotlabs/Module/Setup.php:737
+#: ../../Zotlabs/Module/Setup.php:742
 msgid "<h1>What next</h1>"
 msgstr "<h1>What next</h1>"
 
-#: ../../Zotlabs/Module/Setup.php:738
+#: ../../Zotlabs/Module/Setup.php:743
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the "
 "poller."
@@ -6029,70 +5982,76 @@ msgstr "Voorstellen, lofbetuigingen, enz. - e-mail  \"redmatrix\" at librelist -
 msgid "Site Administrators"
 msgstr "Hubbeheerders: "
 
-#: ../../Zotlabs/Module/Sources.php:36
+#: ../../Zotlabs/Module/Sources.php:37
 msgid "Failed to create source. No channel selected."
 msgstr "Aanmaken bron mislukt. Geen kanaal geselecteerd."
 
-#: ../../Zotlabs/Module/Sources.php:49
+#: ../../Zotlabs/Module/Sources.php:51
 msgid "Source created."
 msgstr "Bron aangemaakt."
 
-#: ../../Zotlabs/Module/Sources.php:61
+#: ../../Zotlabs/Module/Sources.php:64
 msgid "Source updated."
 msgstr "Bron aangemaakt."
 
-#: ../../Zotlabs/Module/Sources.php:86
+#: ../../Zotlabs/Module/Sources.php:90
 msgid "*"
 msgstr "*"
 
-#: ../../Zotlabs/Module/Sources.php:92 ../../include/features.php:71
-#: ../../include/widgets.php:581
+#: ../../Zotlabs/Module/Sources.php:96 ../../include/widgets.php:630
+#: ../../include/features.php:71
 msgid "Channel Sources"
 msgstr "Kanaalbronnen"
 
-#: ../../Zotlabs/Module/Sources.php:93
+#: ../../Zotlabs/Module/Sources.php:97
 msgid "Manage remote sources of content for your channel."
 msgstr "Beheer externe bronnen met inhoud voor jouw kanaal"
 
-#: ../../Zotlabs/Module/Sources.php:94 ../../Zotlabs/Module/Sources.php:104
+#: ../../Zotlabs/Module/Sources.php:98 ../../Zotlabs/Module/Sources.php:108
 msgid "New Source"
 msgstr "Nieuwe bron"
 
-#: ../../Zotlabs/Module/Sources.php:105 ../../Zotlabs/Module/Sources.php:137
+#: ../../Zotlabs/Module/Sources.php:109 ../../Zotlabs/Module/Sources.php:143
 msgid ""
 "Import all or selected content from the following channel into this channel "
 "and distribute it according to your channel settings."
 msgstr "Importeer complete of gedeelde inhoud vanuit het volgende kanaal naar dit kanaal, en verdeel het vervolgens volgens jouw kanaalinstellingen."
 
-#: ../../Zotlabs/Module/Sources.php:106 ../../Zotlabs/Module/Sources.php:138
+#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144
 msgid "Only import content with these words (one per line)"
 msgstr "Importeer alleen inhoud met deze woorden (één per regel)"
 
-#: ../../Zotlabs/Module/Sources.php:106 ../../Zotlabs/Module/Sources.php:138
+#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144
 msgid "Leave blank to import all public content"
 msgstr "Laat leeg om alle openbare inhoud te importeren"
 
-#: ../../Zotlabs/Module/Sources.php:107 ../../Zotlabs/Module/Sources.php:141
+#: ../../Zotlabs/Module/Sources.php:111 ../../Zotlabs/Module/Sources.php:148
 msgid "Channel Name"
 msgstr "Kanaalnaam"
 
-#: ../../Zotlabs/Module/Sources.php:127 ../../Zotlabs/Module/Sources.php:154
+#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:147
+msgid ""
+"Add the following categories to posts imported from this source (comma "
+"separated)"
+msgstr "De volgende categorieën aan berichten toevoegen die uit deze bron zijn geïmporteerd (door komma's gescheiden)"
+
+#: ../../Zotlabs/Module/Sources.php:133 ../../Zotlabs/Module/Sources.php:161
 msgid "Source not found."
 msgstr "Bron niet gevonden"
 
-#: ../../Zotlabs/Module/Sources.php:134
+#: ../../Zotlabs/Module/Sources.php:140
 msgid "Edit Source"
 msgstr "Bron bewerken"
 
-#: ../../Zotlabs/Module/Sources.php:135
+#: ../../Zotlabs/Module/Sources.php:141
 msgid "Delete Source"
 msgstr "Bron verwijderen"
 
-#: ../../Zotlabs/Module/Sources.php:162
+#: ../../Zotlabs/Module/Sources.php:169
 msgid "Source removed"
 msgstr "Bron verwijderd"
 
-#: ../../Zotlabs/Module/Sources.php:164
+#: ../../Zotlabs/Module/Sources.php:171
 msgid "Unable to remove source."
 msgstr "Verwijderen bron mislukt."
 
@@ -6120,8 +6079,8 @@ msgstr "Negeren/Verbergen"
 msgid "post"
 msgstr "bericht"
 
-#: ../../Zotlabs/Module/Tagger.php:57 ../../include/text.php:1948
-#: ../../include/conversation.php:150
+#: ../../Zotlabs/Module/Tagger.php:57 ../../include/conversation.php:150
+#: ../../include/text.php:1960
 msgid "comment"
 msgstr "reactie"
 
@@ -6274,20 +6233,20 @@ msgstr "Connecties weergeven"
 msgid "Source of Item"
 msgstr "Bron van item"
 
-#: ../../Zotlabs/Module/Webpages.php:186 ../../include/apps.php:136
-#: ../../include/conversation.php:1704 ../../include/nav.php:106
+#: ../../Zotlabs/Module/Webpages.php:184 ../../include/nav.php:106
+#: ../../include/conversation.php:1692 ../../include/apps.php:168
 msgid "Webpages"
 msgstr "Webpagina's"
 
-#: ../../Zotlabs/Module/Webpages.php:197 ../../include/page_widgets.php:41
+#: ../../Zotlabs/Module/Webpages.php:195 ../../include/page_widgets.php:41
 msgid "Actions"
 msgstr "Acties"
 
-#: ../../Zotlabs/Module/Webpages.php:198 ../../include/page_widgets.php:42
+#: ../../Zotlabs/Module/Webpages.php:196 ../../include/page_widgets.php:42
 msgid "Page Link"
 msgstr "Paginalink"
 
-#: ../../Zotlabs/Module/Webpages.php:199
+#: ../../Zotlabs/Module/Webpages.php:197
 msgid "Page Title"
 msgstr "Paginatitel"
 
@@ -6303,11 +6262,11 @@ msgstr "Zoek een xchan (of webbie) die begint met:"
 msgid "No username found in import file."
 msgstr "Geen gebruikersnaam in het importbestand gevonden."
 
-#: ../../include/Import/import_diaspora.php:42 ../../include/import.php:44
+#: ../../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."
 
-#: ../../include/dba/dba_driver.php:141
+#: ../../include/dba/dba_driver.php:142
 #, php-format
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr "Kan DNS-informatie voor databaseserver '%s' niet vinden"
@@ -6349,148 +6308,148 @@ msgstr "Niet in staat om aangemaakte identiteit te vinden"
 msgid "Default Profile"
 msgstr "Standaardprofiel"
 
-#: ../../include/identity.php:784
+#: ../../include/identity.php:791
 msgid "Requested channel is not available."
 msgstr "Opgevraagd kanaal is niet beschikbaar."
 
-#: ../../include/identity.php:931
+#: ../../include/identity.php:938
 msgid "Create New Profile"
 msgstr "Nieuw profiel aanmaken"
 
-#: ../../include/identity.php:934 ../../include/nav.php:90
+#: ../../include/identity.php:941 ../../include/nav.php:90
 msgid "Edit Profile"
 msgstr "Profiel bewerken"
 
-#: ../../include/identity.php:951
+#: ../../include/identity.php:958
 msgid "Visible to everybody"
 msgstr "Voor iedereen zichtbaar"
 
-#: ../../include/identity.php:1026 ../../include/identity.php:1281
+#: ../../include/identity.php:1033 ../../include/identity.php:1288
 msgid "Gender:"
 msgstr "Geslacht:"
 
-#: ../../include/identity.php:1027 ../../include/identity.php:1325
+#: ../../include/identity.php:1034 ../../include/identity.php:1332
 msgid "Status:"
 msgstr "Status:"
 
-#: ../../include/identity.php:1028 ../../include/identity.php:1336
+#: ../../include/identity.php:1035 ../../include/identity.php:1343
 msgid "Homepage:"
 msgstr "Homepagina:"
 
-#: ../../include/identity.php:1029
+#: ../../include/identity.php:1036
 msgid "Online Now"
 msgstr "Nu online"
 
-#: ../../include/identity.php:1117 ../../include/identity.php:1193
+#: ../../include/identity.php:1124 ../../include/identity.php:1200
 msgid "F d"
 msgstr "d F"
 
-#: ../../include/identity.php:1173
+#: ../../include/identity.php:1180
 msgid "Birthday Reminders"
 msgstr "Verjaardagsherinneringen"
 
-#: ../../include/identity.php:1174
+#: ../../include/identity.php:1181
 msgid "Birthdays this week:"
 msgstr "Verjaardagen deze week:"
 
-#: ../../include/identity.php:1225
+#: ../../include/identity.php:1232
 msgid "[No description]"
 msgstr "[Geen omschrijving]"
 
-#: ../../include/identity.php:1243
+#: ../../include/identity.php:1250
 msgid "Event Reminders"
 msgstr "Herinneringen"
 
-#: ../../include/identity.php:1244
+#: ../../include/identity.php:1251
 msgid "Events this week:"
 msgstr "Gebeurtenissen deze week:"
 
-#: ../../include/identity.php:1286
+#: ../../include/identity.php:1293
 msgid "Like this channel"
 msgstr "Vind dit kanaal leuk"
 
-#: ../../include/identity.php:1310
+#: ../../include/identity.php:1317
 msgid "j F, Y"
 msgstr "F j Y"
 
-#: ../../include/identity.php:1311
+#: ../../include/identity.php:1318
 msgid "j F"
 msgstr "F j"
 
-#: ../../include/identity.php:1318
+#: ../../include/identity.php:1325
 msgid "Birthday:"
 msgstr "Geboortedatum:"
 
-#: ../../include/identity.php:1331
+#: ../../include/identity.php:1338
 #, php-format
 msgid "for %1$d %2$s"
 msgstr "voor %1$d %2$s"
 
-#: ../../include/identity.php:1334
+#: ../../include/identity.php:1341
 msgid "Sexual Preference:"
 msgstr "Seksuele voorkeur:"
 
-#: ../../include/identity.php:1340
+#: ../../include/identity.php:1347
 msgid "Tags:"
 msgstr "Tags:"
 
-#: ../../include/identity.php:1342
+#: ../../include/identity.php:1349
 msgid "Political Views:"
 msgstr "Politieke overtuigingen:"
 
-#: ../../include/identity.php:1344
+#: ../../include/identity.php:1351
 msgid "Religion:"
 msgstr "Religie:"
 
-#: ../../include/identity.php:1348
+#: ../../include/identity.php:1355
 msgid "Hobbies/Interests:"
 msgstr "Hobby's/interesses:"
 
-#: ../../include/identity.php:1350
+#: ../../include/identity.php:1357
 msgid "Likes:"
 msgstr "Houdt van:"
 
-#: ../../include/identity.php:1352
+#: ../../include/identity.php:1359
 msgid "Dislikes:"
 msgstr "Houdt niet van:"
 
-#: ../../include/identity.php:1354
+#: ../../include/identity.php:1361
 msgid "Contact information and Social Networks:"
 msgstr "Contactinformatie en sociale netwerken:"
 
-#: ../../include/identity.php:1356
+#: ../../include/identity.php:1363
 msgid "My other channels:"
 msgstr "Mijn andere kanalen"
 
-#: ../../include/identity.php:1358
+#: ../../include/identity.php:1365
 msgid "Musical interests:"
 msgstr "Muzikale interesses:"
 
-#: ../../include/identity.php:1360
+#: ../../include/identity.php:1367
 msgid "Books, literature:"
 msgstr "Boeken, literatuur:"
 
-#: ../../include/identity.php:1362
+#: ../../include/identity.php:1369
 msgid "Television:"
 msgstr "Televisie:"
 
-#: ../../include/identity.php:1364
+#: ../../include/identity.php:1371
 msgid "Film/dance/culture/entertainment:"
 msgstr "Films/dansen/cultuur/vermaak:"
 
-#: ../../include/identity.php:1366
+#: ../../include/identity.php:1373
 msgid "Love/Romance:"
 msgstr "Liefde/romantiek:"
 
-#: ../../include/identity.php:1368
+#: ../../include/identity.php:1375
 msgid "Work/employment:"
 msgstr "Werk/beroep:"
 
-#: ../../include/identity.php:1370
+#: ../../include/identity.php:1377
 msgid "School/education:"
 msgstr "School/opleiding:"
 
-#: ../../include/identity.php:1390
+#: ../../include/identity.php:1397
 msgid "Like this thing"
 msgstr "Vind dit ding leuk"
 
@@ -6503,237 +6462,47 @@ msgstr "maakte een nieuw bericht aan"
 msgid "commented on %s's post"
 msgstr "gaf een reactie op een bericht van %s"
 
-#: ../../include/ItemObject.php:89 ../../include/conversation.php:664
-msgid "Private Message"
-msgstr "Niet voor iedereen zichtbaar"
+#: ../../include/oembed.php:324
+msgid "Embedded content"
+msgstr "Ingesloten (embedded) inhoud"
 
-#: ../../include/ItemObject.php:126 ../../include/conversation.php:656
-msgid "Select"
-msgstr "Kies"
+#: ../../include/oembed.php:333
+msgid "Embedding disabled"
+msgstr "Insluiten (embedding) uitgeschakeld"
 
-#: ../../include/ItemObject.php:130
-msgid "Save to Folder"
-msgstr "In map opslaan"
+#: ../../include/acl_selectors.php:236
+#: ../../include/PermissionDescription.php:31
+msgid "Visible to your default audience"
+msgstr "Voor iedereen zichtbaar, mits niet anders ingesteld"
 
-#: ../../include/ItemObject.php:151
-msgid "I will attend"
-msgstr "Aanwezig"
+#: ../../include/acl_selectors.php:274
+msgid "Limit access:"
+msgstr "Toegang beperken:"
 
-#: ../../include/ItemObject.php:151
-msgid "I will not attend"
-msgstr "Niet aanwezig"
+#: ../../include/acl_selectors.php:275
+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/ItemObject.php:151
-msgid "I might attend"
-msgstr "Mogelijk aanwezig"
+#: ../../include/acl_selectors.php:276
+msgid "Show"
+msgstr "Tonen"
 
-#: ../../include/ItemObject.php:161
-msgid "I agree"
-msgstr "Eens"
+#: ../../include/acl_selectors.php:277
+msgid "Don't show"
+msgstr "Niet tonen"
 
-#: ../../include/ItemObject.php:161
-msgid "I disagree"
-msgstr "Oneens"
+#: ../../include/acl_selectors.php:283
+msgid "Other networks and post services"
+msgstr "Andere netwerken en diensten"
 
-#: ../../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:328
-msgid "like"
-msgstr "vind dit leuk"
-
-#: ../../include/ItemObject.php:255 ../../include/taxonomy.php:329
-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
+#: ../../include/acl_selectors.php:313
 #, 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"
-
-#: ../../include/ItemObject.php:319
-msgid "to"
-msgstr "aan"
-
-#: ../../include/ItemObject.php:320
-msgid "via"
-msgstr "via"
-
-#: ../../include/ItemObject.php:321
-msgid "Wall-to-Wall"
-msgstr "Kanaal-naar-kanaal"
-
-#: ../../include/ItemObject.php:322
-msgid "via Wall-To-Wall:"
-msgstr "via kanaal-naar-kanaal"
-
-#: ../../include/ItemObject.php:334 ../../include/conversation.php:719
-#, php-format
-msgid "from %s"
-msgstr "van %s"
-
-#: ../../include/ItemObject.php:337 ../../include/conversation.php:722
-#, php-format
-msgid "last edited: %s"
-msgstr "laatst bewerkt: %s"
-
-#: ../../include/ItemObject.php:338 ../../include/conversation.php:723
-#, php-format
-msgid "Expires: %s"
-msgstr "Verloopt: %s"
-
-#: ../../include/ItemObject.php:362 ../../bookmarker/bookmarker.php:45
-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:709
-msgid "Image"
-msgstr "Afbeelding"
-
-#: ../../include/ItemObject.php:710
-msgid "Insert Link"
-msgstr "Link invoegen"
-
-#: ../../include/ItemObject.php:711
-msgid "Video"
-msgstr "Video"
-
-#: ../../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:317 ../../include/account.php:344
-#: ../../include/account.php:404 ../../include/network.php:1875
-msgid "Administrator"
-msgstr "Beheerder"
-
-#: ../../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/account.php:414
-msgid "Account approved."
-msgstr "Account goedgekeurd"
-
-#: ../../include/account.php:454
-#, 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."
-
-#: ../../include/account.php:735
-msgid "This action is not available under your subscription plan."
-msgstr "Deze handeling is niet mogelijk met jouw abonnement."
+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/profile_selectors.php:6
 msgid "Currently Male"
@@ -6968,22 +6737,6 @@ msgstr "Maakt mij niks uit"
 msgid "Ask me"
 msgstr "Vraag het me"
 
-#: ../../include/acl_selectors.php:218
-msgid "Visible to your default audience"
-msgstr "Voor iedereen zichtbaar, mits niet anders ingesteld"
-
-#: ../../include/acl_selectors.php:243
-msgid "Show"
-msgstr "Tonen"
-
-#: ../../include/acl_selectors.php:244
-msgid "Don't show"
-msgstr "Niet tonen"
-
-#: ../../include/acl_selectors.php:249
-msgid "Other networks and post services"
-msgstr "Andere netwerken en diensten"
-
 #: ../../include/activities.php:42
 msgid " and "
 msgstr " en "
@@ -7007,311 +6760,146 @@ msgstr "Bezoek het %2$s van %1$s"
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr "%1$s heeft een aangepaste %2$s, %3$s veranderd."
 
-#: ../../include/text.php:394
-msgid "prev"
-msgstr "vorige"
-
-#: ../../include/text.php:396
-msgid "first"
-msgstr "eerste"
-
-#: ../../include/text.php:425
-msgid "last"
-msgstr "laatste"
-
-#: ../../include/text.php:428
-msgid "next"
-msgstr "volgende"
-
-#: ../../include/text.php:438
-msgid "older"
-msgstr "ouder"
-
-#: ../../include/text.php:440
-msgid "newer"
-msgstr "nieuwer"
-
-#: ../../include/text.php:822
-msgid "No connections"
-msgstr "Geen connecties"
-
-#: ../../include/text.php:847
+#: ../../include/contact_widgets.php:14
 #, php-format
-msgid "View all %s connections"
-msgstr "Toon alle %s connecties"
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] "%d uitnodiging beschikbaar"
+msgstr[1] "%d uitnodigingen beschikbaar"
 
-#: ../../include/text.php:992 ../../include/text.php:997
-msgid "poke"
-msgstr "aanstoten"
+#: ../../include/contact_widgets.php:22
+msgid "Find Channels"
+msgstr "Kanalen vinden"
 
-#: ../../include/text.php:992 ../../include/text.php:997
-#: ../../include/conversation.php:243
-msgid "poked"
-msgstr "aangestoten"
+#: ../../include/contact_widgets.php:23
+msgid "Enter name or interest"
+msgstr "Vul naam of interesse in"
 
-#: ../../include/text.php:998
-msgid "ping"
-msgstr "ping"
+#: ../../include/contact_widgets.php:24
+msgid "Connect/Follow"
+msgstr "Verbinden/volgen"
 
-#: ../../include/text.php:998
-msgid "pinged"
-msgstr "gepingd"
+#: ../../include/contact_widgets.php:25
+msgid "Examples: Robert Morgenstein, Fishing"
+msgstr "Voorbeeld: Robert Morgenstein, vissen"
 
-#: ../../include/text.php:999
-msgid "prod"
-msgstr "por"
+#: ../../include/contact_widgets.php:29
+msgid "Random Profile"
+msgstr "Willekeurig profiel"
 
-#: ../../include/text.php:999
-msgid "prodded"
-msgstr "gepord"
+#: ../../include/contact_widgets.php:30
+msgid "Invite Friends"
+msgstr "Vrienden uitnodigen"
 
-#: ../../include/text.php:1000
-msgid "slap"
-msgstr "slaan"
+#: ../../include/contact_widgets.php:32
+msgid "Advanced example: name=fred and country=iceland"
+msgstr "Geavanceerd voorbeeld (Engels): name=jan en country=nederland"
 
-#: ../../include/text.php:1000
-msgid "slapped"
-msgstr "sloeg"
+#: ../../include/contact_widgets.php:57 ../../include/widgets.php:310
+#: ../../include/features.php:97
+msgid "Saved Folders"
+msgstr "Bewaarde mappen"
 
-#: ../../include/text.php:1001
-msgid "finger"
-msgstr "finger"
+#: ../../include/contact_widgets.php:60 ../../include/contact_widgets.php:100
+#: ../../include/widgets.php:313 ../../include/widgets.php:432
+msgid "Everything"
+msgstr "Alles"
 
-#: ../../include/text.php:1001
-msgid "fingered"
-msgstr "gefingerd"
+#: ../../include/contact_widgets.php:97 ../../include/widgets.php:46
+#: ../../include/widgets.php:429 ../../include/taxonomy.php:188
+#: ../../include/taxonomy.php:270
+msgid "Categories"
+msgstr "Categorieën"
 
-#: ../../include/text.php:1002
-msgid "rebuff"
-msgstr "afpoeieren"
+#: ../../include/contact_widgets.php:130
+#, php-format
+msgid "%d connection in common"
+msgid_plural "%d connections in common"
+msgstr[0] "%d gemeenschappelijke connectie"
+msgstr[1] "%d gemeenschappelijke connecties"
 
-#: ../../include/text.php:1002
-msgid "rebuffed"
-msgstr "afgepoeierd"
+#: ../../include/contact_widgets.php:135
+msgid "show more"
+msgstr "meer connecties weergeven"
 
-#: ../../include/text.php:1014
-msgid "happy"
-msgstr "gelukkig"
-
-#: ../../include/text.php:1015
-msgid "sad"
-msgstr "bedroefd"
-
-#: ../../include/text.php:1016
-msgid "mellow"
-msgstr "mellow"
-
-#: ../../include/text.php:1017
-msgid "tired"
-msgstr "moe"
-
-#: ../../include/text.php:1018
-msgid "perky"
-msgstr "parmantig"
-
-#: ../../include/text.php:1019
-msgid "angry"
-msgstr "boos"
-
-#: ../../include/text.php:1020
-msgid "stupefied"
-msgstr "verbijsterd"
-
-#: ../../include/text.php:1021
-msgid "puzzled"
-msgstr "verward"
-
-#: ../../include/text.php:1022
-msgid "interested"
-msgstr "geïnteresseerd"
-
-#: ../../include/text.php:1023
-msgid "bitter"
-msgstr "verbitterd"
-
-#: ../../include/text.php:1024
-msgid "cheerful"
-msgstr "vrolijk"
-
-#: ../../include/text.php:1025
-msgid "alive"
-msgstr "levendig"
-
-#: ../../include/text.php:1026
-msgid "annoyed"
-msgstr "geërgerd"
-
-#: ../../include/text.php:1027
-msgid "anxious"
-msgstr "bezorgd"
-
-#: ../../include/text.php:1028
-msgid "cranky"
-msgstr "humeurig"
-
-#: ../../include/text.php:1029
-msgid "disturbed"
-msgstr "verontrust"
-
-#: ../../include/text.php:1030
-msgid "frustrated"
-msgstr "gefrustreerd "
-
-#: ../../include/text.php:1031
-msgid "depressed"
-msgstr "gedeprimeerd"
-
-#: ../../include/text.php:1032
-msgid "motivated"
-msgstr "gemotiveerd"
-
-#: ../../include/text.php:1033
-msgid "relaxed"
-msgstr "ontspannen"
-
-#: ../../include/text.php:1034
-msgid "surprised"
-msgstr "verrast"
-
-#: ../../include/text.php:1206 ../../include/js_strings.php:70
-msgid "Monday"
-msgstr "maandag"
-
-#: ../../include/text.php:1206 ../../include/js_strings.php:71
-msgid "Tuesday"
-msgstr "dinsdag"
-
-#: ../../include/text.php:1206 ../../include/js_strings.php:72
-msgid "Wednesday"
-msgstr "woensdag"
-
-#: ../../include/text.php:1206 ../../include/js_strings.php:73
-msgid "Thursday"
-msgstr "donderdag"
-
-#: ../../include/text.php:1206 ../../include/js_strings.php:74
-msgid "Friday"
-msgstr "vrijdag"
-
-#: ../../include/text.php:1206 ../../include/js_strings.php:75
-msgid "Saturday"
-msgstr "zaterdag"
-
-#: ../../include/text.php:1206 ../../include/js_strings.php:69
-msgid "Sunday"
-msgstr "zondag"
-
-#: ../../include/text.php:1210 ../../include/js_strings.php:45
-msgid "January"
-msgstr "januari"
-
-#: ../../include/text.php:1210 ../../include/js_strings.php:46
-msgid "February"
-msgstr "februari"
-
-#: ../../include/text.php:1210 ../../include/js_strings.php:47
-msgid "March"
-msgstr "maart"
-
-#: ../../include/text.php:1210 ../../include/js_strings.php:48
-msgid "April"
-msgstr "april"
-
-#: ../../include/text.php:1210
-msgid "May"
-msgstr "mei"
-
-#: ../../include/text.php:1210 ../../include/js_strings.php:50
-msgid "June"
-msgstr "juni"
-
-#: ../../include/text.php:1210 ../../include/js_strings.php:51
-msgid "July"
-msgstr "juli"
-
-#: ../../include/text.php:1210 ../../include/js_strings.php:52
-msgid "August"
-msgstr "augustus"
-
-#: ../../include/text.php:1210 ../../include/js_strings.php:53
-msgid "September"
-msgstr "september"
-
-#: ../../include/text.php:1210 ../../include/js_strings.php:54
-msgid "October"
-msgstr "oktober"
-
-#: ../../include/text.php:1210 ../../include/js_strings.php:55
-msgid "November"
-msgstr "november"
-
-#: ../../include/text.php:1210 ../../include/js_strings.php:56
-msgid "December"
-msgstr "december"
-
-#: ../../include/text.php:1287 ../../include/text.php:1291
-msgid "Unknown Attachment"
-msgstr "Onbekende bijlage"
-
-#: ../../include/text.php:1293
-msgid "unknown"
-msgstr "onbekend"
-
-#: ../../include/text.php:1329
-msgid "remove category"
-msgstr "categorie verwijderen"
-
-#: ../../include/text.php:1406
-msgid "remove from file"
-msgstr "uit map verwijderen"
-
-#: ../../include/text.php:1437 ../../include/bb2diaspora.php:487
-#: ../../include/event.php:22
+#: ../../include/event.php:22 ../../include/text.php:1466
+#: ../../include/bb2diaspora.php:487
 msgid "l F d, Y \\@ g:i A"
 msgstr "l d F Y \\@ G:i"
 
-#: ../../include/text.php:1441 ../../include/bb2diaspora.php:493
-#: ../../include/event.php:30
+#: ../../include/event.php:30 ../../include/text.php:1470
+#: ../../include/bb2diaspora.php:493
 msgid "Starts:"
 msgstr "Start:"
 
-#: ../../include/text.php:1445 ../../include/bb2diaspora.php:501
-#: ../../include/event.php:40
+#: ../../include/event.php:40 ../../include/text.php:1474
+#: ../../include/bb2diaspora.php:501
 msgid "Finishes:"
 msgstr "Einde:"
 
-#: ../../include/text.php:1735 ../../include/text.php:1807
-msgid "default"
-msgstr "standaard"
+#: ../../include/event.php:769
+msgid "This event has been added to your calendar."
+msgstr "Dit evenement is aan jouw agenda toegevoegd."
 
-#: ../../include/text.php:1743
-msgid "Page layout"
-msgstr "Pagina-lay-out"
+#: ../../include/event.php:968
+msgid "Not specified"
+msgstr "Niet aangegeven"
 
-#: ../../include/text.php:1743
-msgid "You can create your own with the layouts tool"
-msgstr "Je kan jouw eigen lay-out ontwerpen onder lay-outs"
+#: ../../include/event.php:969
+msgid "Needs Action"
+msgstr "Actie vereist"
 
-#: ../../include/text.php:1785
-msgid "Page content type"
-msgstr "Opmaaktype pagina"
+#: ../../include/event.php:970
+msgid "Completed"
+msgstr "Voltooid"
 
-#: ../../include/text.php:1819
-msgid "Select an alternate language"
-msgstr "Kies een andere taal"
+#: ../../include/event.php:971
+msgid "In Process"
+msgstr "In behandeling"
 
-#: ../../include/text.php:1953
-msgid "activity"
-msgstr "activiteit"
+#: ../../include/event.php:972
+msgid "Cancelled"
+msgstr "Geannuleerd"
 
-#: ../../include/text.php:2248
-msgid "Design Tools"
-msgstr "Ontwerp-hulpmiddelen"
+#: ../../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/text.php:2254
-msgid "Pages"
-msgstr "Pagina's"
+#: ../../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/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/import.php:74
+msgid "Channel clone failed. Import failed."
+msgstr "Het klonen van het kanaal is mislukt. Importeren mislukt."
 
 #: ../../include/zot.php:680
 msgid "Invalid data packet"
@@ -7321,408 +6909,272 @@ msgstr "Datapakket ongeldig"
 msgid "Unable to verify channel signature"
 msgstr "Kanaalkenmerk kon niet worden geverifieerd.  "
 
-#: ../../include/zot.php:2332
+#: ../../include/zot.php:2342
 #, php-format
 msgid "Unable to verify site signature for %s"
 msgstr "Hubkenmerk voor %s kon niet worden geverifieerd"
 
-#: ../../include/zot.php:3670
+#: ../../include/zot.php:3680
 msgid "invalid target signature"
 msgstr "ongeldig doelkenmerk"
 
-#: ../../include/apps.php:128
-msgid "Site Admin"
-msgstr "Hubbeheerder"
+#: ../../include/widgets.php:103
+msgid "System"
+msgstr "Systeem"
 
-#: ../../include/apps.php:129 ../../include/conversation.php:1694
-#: ../../include/nav.php:102
-msgid "Bookmarks"
-msgstr "Bladwijzers"
+#: ../../include/widgets.php:106
+msgid "New App"
+msgstr "Nieuwe app"
 
-#: ../../include/apps.php:130
-msgid "Address Book"
-msgstr "Connecties"
+#: ../../include/widgets.php:154
+msgid "Suggestions"
+msgstr "Voorgestelde kanalen"
 
-#: ../../include/apps.php:131 ../../include/nav.php:110 ../../boot.php:1615
-msgid "Login"
-msgstr "Inloggen"
+#: ../../include/widgets.php:155
+msgid "See more..."
+msgstr "Meer..."
 
-#: ../../include/apps.php:133 ../../include/nav.php:179
-msgid "Grid"
-msgstr "Grid"
+#: ../../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/apps.php:137 ../../include/nav.php:182
-msgid "Channel Home"
-msgstr "Jouw kanaal"
+#: ../../include/widgets.php:181
+msgid "Add New Connection"
+msgstr "Nieuwe connectie toevoegen"
 
-#: ../../include/apps.php:140 ../../include/conversation.php:1667
-#: ../../include/conversation.php:1670 ../../include/nav.php:201
-msgid "Events"
-msgstr "Agenda"
+#: ../../include/widgets.php:182
+msgid "Enter channel address"
+msgstr "Vul kanaaladres in"
 
-#: ../../include/apps.php:141 ../../include/nav.php:167
-msgid "Directory"
-msgstr "Kanalengids"
+#: ../../include/widgets.php:183
+msgid "Examples: bob@example.com, https://example.com/barbara"
+msgstr "Voorbeelden: bob@example.com, http://example.com/barbara"
 
-#: ../../include/apps.php:143 ../../include/nav.php:193
-msgid "Mail"
-msgstr "Privéberichten"
+#: ../../include/widgets.php:199
+msgid "Notes"
+msgstr "Aantekeningen"
 
-#: ../../include/apps.php:146 ../../include/nav.php:96
-msgid "Chat"
-msgstr "Chatten"
+#: ../../include/widgets.php:273
+msgid "Remove term"
+msgstr "Verwijder zoekterm"
 
-#: ../../include/apps.php:148
-msgid "Probe"
-msgstr "Onderzoeken"
+#: ../../include/widgets.php:281 ../../include/features.php:84
+msgid "Saved Searches"
+msgstr "Opgeslagen zoekopdrachten"
 
-#: ../../include/apps.php:149
-msgid "Suggest"
-msgstr "Voorstellen"
+#: ../../include/widgets.php:282 ../../include/group.php:316
+msgid "add"
+msgstr "toevoegen"
 
-#: ../../include/apps.php:150
-msgid "Random Channel"
-msgstr "Willekeurig kanaal"
+#: ../../include/widgets.php:354
+msgid "Archives"
+msgstr "Archieven"
 
-#: ../../include/apps.php:151
-msgid "Invite"
-msgstr "Uitnodigen "
+#: ../../include/widgets.php:516
+msgid "Refresh"
+msgstr "Vernieuwen"
 
-#: ../../include/apps.php:152 ../../include/widgets.php:1338
-msgid "Features"
+#: ../../include/widgets.php:556
+msgid "Account settings"
+msgstr "Account"
+
+#: ../../include/widgets.php:562
+msgid "Channel settings"
+msgstr "Kanaal"
+
+#: ../../include/widgets.php:571
+msgid "Additional features"
 msgstr "Extra functies"
 
-#: ../../include/apps.php:154
-msgid "Post"
-msgstr "Bericht"
+#: ../../include/widgets.php:578
+msgid "Feature/Addon settings"
+msgstr "Plugin-instellingen"
 
-#: ../../include/apps.php:252
-msgid "Install"
-msgstr "Installeren"
+#: ../../include/widgets.php:584
+msgid "Display settings"
+msgstr "Weergave"
 
-#: ../../include/apps.php:257
-msgid "Purchase"
-msgstr "Aanschaffen"
+#: ../../include/widgets.php:591
+msgid "Manage locations"
+msgstr "Locaties beheren"
 
-#: ../../include/import.php:23
-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/widgets.php:600
+msgid "Export channel"
+msgstr "Kanaal exporteren"
 
-#: ../../include/import.php:70
-msgid "Channel clone failed. Import failed."
-msgstr "Het klonen van het kanaal is mislukt. Importeren mislukt."
+#: ../../include/widgets.php:607
+msgid "Connected apps"
+msgstr "Verbonden applicaties"
 
-#: ../../include/bb2diaspora.php:398
-msgid "Attachments:"
-msgstr "Bijlagen:"
+#: ../../include/widgets.php:622
+msgid "Premium Channel Settings"
+msgstr "Instellingen premiumkanaal"
 
-#: ../../include/bb2diaspora.php:489
-msgid "$Projectname event notification:"
-msgstr "Notificatie $Projectname-gebeurtenis:"
+#: ../../include/widgets.php:651
+msgid "Private Mail Menu"
+msgstr "Privéberichten"
 
-#: ../../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/widgets.php:653
+msgid "Combined View"
+msgstr "Gecombineerd postvak"
 
-#: ../../include/conversation.php:239
-#, php-format
-msgid "%1$s poked %2$s"
-msgstr "%1$s heeft %2$s aangestoten"
+#: ../../include/widgets.php:658 ../../include/nav.php:196
+msgid "Inbox"
+msgstr "Postvak IN"
 
-#: ../../include/conversation.php:691
-#, php-format
-msgid "View %s's profile @ %s"
-msgstr "Bekijk het profiel van %s @ %s"
+#: ../../include/widgets.php:663 ../../include/nav.php:197
+msgid "Outbox"
+msgstr "Postvak UIT"
 
-#: ../../include/conversation.php:710
-msgid "Categories:"
-msgstr "Categorieën:"
+#: ../../include/widgets.php:668 ../../include/nav.php:198
+msgid "New Message"
+msgstr "Nieuw bericht"
 
-#: ../../include/conversation.php:711
-msgid "Filed under:"
-msgstr "Bewaard onder:"
+#: ../../include/widgets.php:685 ../../include/widgets.php:697
+msgid "Conversations"
+msgstr "Conversaties"
 
-#: ../../include/conversation.php:738
-msgid "View in context"
-msgstr "In context bekijken"
+#: ../../include/widgets.php:689
+msgid "Received Messages"
+msgstr "Ontvangen berichten"
 
-#: ../../include/conversation.php:850
-msgid "remove"
-msgstr "verwijderen"
+#: ../../include/widgets.php:693
+msgid "Sent Messages"
+msgstr "Verzonden berichten"
 
-#: ../../include/conversation.php:854 ../../include/nav.php:247
-msgid "Loading..."
-msgstr "Aan het laden..."
+#: ../../include/widgets.php:707
+msgid "No messages."
+msgstr "Geen berichten"
 
-#: ../../include/conversation.php:855
-msgid "Delete Selected Items"
-msgstr "Verwijder de geselecteerde items"
+#: ../../include/widgets.php:725
+msgid "Delete conversation"
+msgstr "Verwijder conversatie"
 
-#: ../../include/conversation.php:953
-msgid "View Source"
-msgstr "Bron weergeven"
+#: ../../include/widgets.php:751
+msgid "Events Menu"
+msgstr "Agenda-menu"
 
-#: ../../include/conversation.php:954
-msgid "Follow Thread"
-msgstr "Conversatie volgen"
+#: ../../include/widgets.php:752
+msgid "Day View"
+msgstr "Dag tonen"
 
-#: ../../include/conversation.php:955
-msgid "Unfollow Thread"
-msgstr "Conversatie niet meer volgen"
+#: ../../include/widgets.php:753
+msgid "Week View"
+msgstr "Week tonen"
 
-#: ../../include/conversation.php:960
-msgid "Activity/Posts"
-msgstr "Activiteit/berichten connectie"
+#: ../../include/widgets.php:754
+msgid "Month View"
+msgstr "Maand tonen"
 
-#: ../../include/conversation.php:962
-msgid "Edit Connection"
-msgstr "Connectie bewerken"
+#: ../../include/widgets.php:766
+msgid "Events Tools"
+msgstr "Agenda-hulpmiddelen"
 
-#: ../../include/conversation.php:963
-msgid "Message"
-msgstr "Bericht"
+#: ../../include/widgets.php:767
+msgid "Export Calendar"
+msgstr "Exporteren"
 
-#: ../../include/conversation.php:1080
-#, php-format
-msgid "%s likes this."
-msgstr "%s vindt dit leuk."
+#: ../../include/widgets.php:768
+msgid "Import Calendar"
+msgstr "Importeren"
 
-#: ../../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:1169
-msgid "Visible to <strong>everybody</strong>"
-msgstr "Voor <strong>iedereen</strong> zichtbaar"
-
-#: ../../include/conversation.php:1171
-msgid "Please enter a video link/URL:"
-msgstr "Vul een videolink/URL in:"
-
-#: ../../include/conversation.php:1172
-msgid "Please enter an audio link/URL:"
-msgstr "Vul een audiolink/URL in:"
-
-#: ../../include/conversation.php:1173
-msgid "Tag term:"
-msgstr "Tag:"
-
-#: ../../include/conversation.php:1175
-msgid "Where are you right now?"
-msgstr "Waar bevind je je op dit moment?"
-
-#: ../../include/conversation.php:1211
-msgid "Page link name"
-msgstr "Linknaam pagina"
-
-#: ../../include/conversation.php:1214
-msgid "Post as"
-msgstr "Bericht plaatsen als"
-
-#: ../../include/conversation.php:1222
-msgid "upload photo"
-msgstr "foto uploaden"
-
-#: ../../include/conversation.php:1224
-msgid "attach file"
-msgstr "bestand toevoegen"
-
-#: ../../include/conversation.php:1226
-msgid "web link"
-msgstr "Weblink"
-
-#: ../../include/conversation.php:1227
-msgid "Insert video link"
-msgstr "Videolink invoegen"
-
-#: ../../include/conversation.php:1228
-msgid "video link"
-msgstr "videolink"
-
-#: ../../include/conversation.php:1229
-msgid "Insert audio link"
-msgstr "Audiolink invoegen"
-
-#: ../../include/conversation.php:1230
-msgid "audio link"
-msgstr "audiolink"
-
-#: ../../include/conversation.php:1232
-msgid "set location"
-msgstr "locatie instellen"
-
-#: ../../include/conversation.php:1237
-msgid "clear location"
-msgstr "locatie wissen"
-
-#: ../../include/conversation.php:1246
-msgid "permissions"
-msgstr "permissies"
-
-#: ../../include/conversation.php:1272
-msgid "Set publish date"
-msgstr "Publicatiedatum instellen"
-
-#: ../../include/conversation.php:1521
-msgid "Discover"
-msgstr "Ontdekken"
-
-#: ../../include/conversation.php:1524
-msgid "Imported public streams"
-msgstr "Openbare streams importeren"
-
-#: ../../include/conversation.php:1529
-msgid "Commented Order"
-msgstr "Nieuwe reacties bovenaan"
-
-#: ../../include/conversation.php:1532
-msgid "Sort by Comment Date"
-msgstr "Berichten met nieuwe reacties bovenaan"
-
-#: ../../include/conversation.php:1536
-msgid "Posted Order"
-msgstr "Nieuwe berichten bovenaan"
-
-#: ../../include/conversation.php:1539
-msgid "Sort by Post Date"
-msgstr "Nieuwe berichten bovenaan"
-
-#: ../../include/conversation.php:1547
-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:1556
-msgid "Activity Stream - by date"
-msgstr "Activiteitenstroom - volgens datum"
-
-#: ../../include/conversation.php:1562
-msgid "Starred"
-msgstr "Met ster"
-
-#: ../../include/conversation.php:1565
-msgid "Favourite Posts"
-msgstr "Favoriete berichten"
-
-#: ../../include/conversation.php:1572
-msgid "Spam"
-msgstr "Spam"
-
-#: ../../include/conversation.php:1575
-msgid "Posts flagged as SPAM"
-msgstr "Berichten gemarkeerd als SPAM"
-
-#: ../../include/conversation.php:1632
-msgid "Status Messages and Posts"
-msgstr "Berichten in dit kanaal"
-
-#: ../../include/conversation.php:1641
-msgid "About"
-msgstr "Over"
-
-#: ../../include/conversation.php:1644
-msgid "Profile Details"
-msgstr "Profiel"
-
-#: ../../include/conversation.php:1653 ../../include/photos.php:506
-msgid "Photo Albums"
-msgstr "Fotoalbums"
-
-#: ../../include/conversation.php:1660
-msgid "Files and Storage"
-msgstr "Bestanden en opslagruimte"
-
-#: ../../include/conversation.php:1681 ../../include/conversation.php:1684
-#: ../../include/widgets.php:794
+#: ../../include/widgets.php:843 ../../include/conversation.php:1669
+#: ../../include/conversation.php:1672
 msgid "Chatrooms"
 msgstr "Chatkanalen"
 
-#: ../../include/conversation.php:1697
-msgid "Saved Bookmarks"
-msgstr "Opgeslagen bladwijzers"
+#: ../../include/widgets.php:847
+msgid "Overview"
+msgstr "Overzicht"
 
-#: ../../include/conversation.php:1707
-msgid "Manage Webpages"
-msgstr "Webpagina's beheren"
+#: ../../include/widgets.php:854
+msgid "Chat Members"
+msgstr "Chatleden"
 
-#: ../../include/conversation.php:1766
-msgctxt "noun"
-msgid "Attending"
-msgid_plural "Attending"
-msgstr[0] "aanwezig"
-msgstr[1] "aanwezig"
+#: ../../include/widgets.php:877
+msgid "Bookmarked Chatrooms"
+msgstr "Bladwijzers van chatkanalen"
 
-#: ../../include/conversation.php:1769
-msgctxt "noun"
-msgid "Not Attending"
-msgid_plural "Not Attending"
-msgstr[0] "niet aanwezig"
-msgstr[1] "niet aanwezig"
+#: ../../include/widgets.php:900
+msgid "Suggested Chatrooms"
+msgstr "Voorgestelde chatkanalen"
 
-#: ../../include/conversation.php:1772
-msgctxt "noun"
-msgid "Undecided"
-msgid_plural "Undecided"
-msgstr[0] "nog niet beslist"
-msgstr[1] "nog niet beslist"
+#: ../../include/widgets.php:1045 ../../include/widgets.php:1157
+msgid "photo/image"
+msgstr "foto/afbeelding"
 
-#: ../../include/conversation.php:1775
-msgctxt "noun"
-msgid "Agree"
-msgid_plural "Agrees"
-msgstr[0] "eens"
-msgstr[1] "eens"
+#: ../../include/widgets.php:1100
+msgid "Click to show more"
+msgstr "Klik voor meer"
 
-#: ../../include/conversation.php:1778
-msgctxt "noun"
-msgid "Disagree"
-msgid_plural "Disagrees"
-msgstr[0] "oneens"
-msgstr[1] "oneens"
+#: ../../include/widgets.php:1251
+msgid "Rating Tools"
+msgstr "Beoordelingen"
 
-#: ../../include/conversation.php:1781
-msgctxt "noun"
-msgid "Abstain"
-msgid_plural "Abstains"
-msgstr[0] "onthouding"
-msgstr[1] "onthoudingen"
+#: ../../include/widgets.php:1255 ../../include/widgets.php:1257
+msgid "Rate Me"
+msgstr "Beoordeel mij"
+
+#: ../../include/widgets.php:1260
+msgid "View Ratings"
+msgstr "Bekijk beoordelingen"
+
+#: ../../include/widgets.php:1317
+msgid "Forums"
+msgstr "Forums"
+
+#: ../../include/widgets.php:1346
+msgid "Tasks"
+msgstr "Taken"
+
+#: ../../include/widgets.php:1355
+msgid "Documentation"
+msgstr "Documentatie"
+
+#: ../../include/widgets.php:1357
+msgid "Project/Site Information"
+msgstr "Project- en hub-informatie"
+
+#: ../../include/widgets.php:1358
+msgid "For Members"
+msgstr "Voor leden"
+
+#: ../../include/widgets.php:1359
+msgid "For Administrators"
+msgstr "Voor beheerders"
+
+#: ../../include/widgets.php:1360
+msgid "For Developers"
+msgstr "Voor ontwikkelaars"
+
+#: ../../include/widgets.php:1384
+msgid "Accounts"
+msgstr "Accounts"
+
+#: ../../include/widgets.php:1384 ../../include/widgets.php:1422
+msgid "Member registrations waiting for confirmation"
+msgstr "Accounts die op goedkeuring wachten"
+
+#: ../../include/widgets.php:1387 ../../include/apps.php:184
+msgid "Features"
+msgstr "Extra functies"
+
+#: ../../include/widgets.php:1390
+msgid "Inspect queue"
+msgstr "Inspecteer berichtenwachtrij"
+
+#: ../../include/widgets.php:1392
+msgid "DB updates"
+msgstr "Database-updates"
+
+#: ../../include/widgets.php:1417 ../../include/nav.php:216
+msgid "Admin"
+msgstr "Beheer"
+
+#: ../../include/widgets.php:1418
+msgid "Plugin Features"
+msgstr "Plugin-opties"
 
 #: ../../include/bookmarks.php:35
 #, php-format
@@ -7776,9 +7228,287 @@ 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/api.php:1338
-msgid "Public Timeline"
-msgstr "Openbare tijdlijn"
+#: ../../include/items.php:890 ../../include/items.php:935
+msgid "(Unknown)"
+msgstr "(Onbekend)"
+
+#: ../../include/items.php:1134
+msgid "Visible to anybody on the internet."
+msgstr "Voor iedereen op het internet zichtbaar."
+
+#: ../../include/items.php:1136
+msgid "Visible to you only."
+msgstr "Alleen voor jou zichtbaar."
+
+#: ../../include/items.php:1138
+msgid "Visible to anybody in this network."
+msgstr "Voor iedereen in dit netwerk zichtbaar."
+
+#: ../../include/items.php:1140
+msgid "Visible to anybody authenticated."
+msgstr "Voor iedereen die geauthenticeerd is zichtbaar."
+
+#: ../../include/items.php:1142
+#, php-format
+msgid "Visible to anybody on %s."
+msgstr "Voor iedereen op %s zichtbaar."
+
+#: ../../include/items.php:1144
+msgid "Visible to all connections."
+msgstr "Voor alle connecties zichtbaar."
+
+#: ../../include/items.php:1146
+msgid "Visible to approved connections."
+msgstr "Voor alle geaccepteerde connecties zichtbaar."
+
+#: ../../include/items.php:1148
+msgid "Visible to specific connections."
+msgstr "Voor specifieke connecties zichtbaar."
+
+#: ../../include/items.php:3910
+msgid "Privacy group is empty."
+msgstr "Privacygroep is leeg"
+
+#: ../../include/items.php:3917
+#, php-format
+msgid "Privacy group: %s"
+msgstr "Privacygroep: %s"
+
+#: ../../include/items.php:3929
+msgid "Connection not found."
+msgstr "Connectie niet gevonden."
+
+#: ../../include/items.php:4278
+msgid "profile photo"
+msgstr "profielfoto"
+
+#: ../../include/nav.php:82 ../../include/nav.php:113 ../../boot.php:1614
+msgid "Logout"
+msgstr "Uitloggen"
+
+#: ../../include/nav.php:82 ../../include/nav.php:113
+msgid "End this session"
+msgstr "Beëindig deze sessie"
+
+#: ../../include/nav.php:85 ../../include/nav.php:144
+msgid "Home"
+msgstr "Home"
+
+#: ../../include/nav.php:85
+msgid "Your posts and conversations"
+msgstr "Jouw kanaal"
+
+#: ../../include/nav.php:86
+msgid "Your profile page"
+msgstr "Jouw profielpagina"
+
+#: ../../include/nav.php:88
+msgid "Manage/Edit profiles"
+msgstr "Beheer/wijzig profielen"
+
+#: ../../include/nav.php:90
+msgid "Edit your profile"
+msgstr "Jouw profiel bewerken"
+
+#: ../../include/nav.php:92
+msgid "Your photos"
+msgstr "Jouw foto's"
+
+#: ../../include/nav.php:93
+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"
+
+#: ../../include/nav.php:106
+msgid "Your webpages"
+msgstr "Jouw webpagina's"
+
+#: ../../include/nav.php:110 ../../include/apps.php:163 ../../boot.php:1615
+msgid "Login"
+msgstr "Inloggen"
+
+#: ../../include/nav.php:110
+msgid "Sign in"
+msgstr "Inloggen"
+
+#: ../../include/nav.php:127
+#, php-format
+msgid "%s - click to logout"
+msgstr "%s - klik om uit te loggen"
+
+#: ../../include/nav.php:130
+msgid "Remote authentication"
+msgstr "Authenticatie op afstand"
+
+#: ../../include/nav.php:130
+msgid "Click to authenticate to your home hub"
+msgstr "Authenticeer jezelf via (bijvoorbeeld) jouw hub"
+
+#: ../../include/nav.php:144
+msgid "Home Page"
+msgstr "Homepage"
+
+#: ../../include/nav.php:147
+msgid "Create an account"
+msgstr "Maak een account aan"
+
+#: ../../include/nav.php:159
+msgid "Help and documentation"
+msgstr "Hulp en documentatie"
+
+#: ../../include/nav.php:163
+msgid "Applications, utilities, links, games"
+msgstr "Apps"
+
+#: ../../include/nav.php:165
+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"
+
+#: ../../include/nav.php:180
+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"
+
+#: ../../include/nav.php:183
+msgid "Mark all channel notifications seen"
+msgstr "Alle kanaalnotificaties als gelezen markeren"
+
+#: ../../include/nav.php:189
+msgid "Notices"
+msgstr "Notificaties"
+
+#: ../../include/nav.php:189
+msgid "Notifications"
+msgstr "Notificaties"
+
+#: ../../include/nav.php:190
+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"
+
+#: ../../include/nav.php:194
+msgid "See all private messages"
+msgstr "Alle privéberichten weergeven"
+
+#: ../../include/nav.php:195
+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:201
+msgid "Event Calendar"
+msgstr "Agenda"
+
+#: ../../include/nav.php:202
+msgid "See all events"
+msgstr "Alle gebeurtenissen weergeven"
+
+#: ../../include/nav.php:203
+msgid "Mark all events seen"
+msgstr "Markeer alle gebeurtenissen als bekeken"
+
+#: ../../include/nav.php:206
+msgid "Manage Your Channels"
+msgstr "Beheer je kanalen"
+
+#: ../../include/nav.php:208
+msgid "Account/Channel Settings"
+msgstr "Account-/kanaal-instellingen"
+
+#: ../../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"
+
+#: ../../include/nav.php:253
+msgid "Please wait..."
+msgstr "Wachten aub..."
+
+#: ../../include/network.php:659
+msgid "view full size"
+msgstr "volledige grootte tonen"
+
+#: ../../include/network.php:1827 ../../include/enotify.php:57
+msgid "$Projectname Notification"
+msgstr "$Projectname-notificatie"
+
+#: ../../include/network.php:1828 ../../include/enotify.php:58
+msgid "$projectname"
+msgstr "$projectname"
+
+#: ../../include/network.php:1830 ../../include/enotify.php:60
+msgid "Thank You,"
+msgstr "Bedankt,"
+
+#: ../../include/network.php:1832 ../../include/enotify.php:62
+#, php-format
+msgid "%s Administrator"
+msgstr "Beheerder %s"
+
+#: ../../include/network.php:1875 ../../include/account.php:317
+#: ../../include/account.php:344 ../../include/account.php:404
+msgid "Administrator"
+msgstr "Beheerder"
+
+#: ../../include/network.php:1889
+msgid "No Subject"
+msgstr "Geen onderwerp"
 
 #: ../../include/contact_selectors.php:56
 msgid "Frequently"
@@ -7845,67 +7575,6 @@ msgstr "XMPP/IM"
 msgid "MySpace"
 msgstr "MySpace"
 
-#: ../../include/contact_widgets.php:14
-#, 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
-msgid "Find Channels"
-msgstr "Kanalen vinden"
-
-#: ../../include/contact_widgets.php:23
-msgid "Enter name or interest"
-msgstr "Vul naam of interesse in"
-
-#: ../../include/contact_widgets.php:24
-msgid "Connect/Follow"
-msgstr "Verbinden/volgen"
-
-#: ../../include/contact_widgets.php:25
-msgid "Examples: Robert Morgenstein, Fishing"
-msgstr "Voorbeeld: Robert Morgenstein, vissen"
-
-#: ../../include/contact_widgets.php:29
-msgid "Random Profile"
-msgstr "Willekeurig profiel"
-
-#: ../../include/contact_widgets.php:30
-msgid "Invite Friends"
-msgstr "Vrienden uitnodigen"
-
-#: ../../include/contact_widgets.php:32
-msgid "Advanced example: name=fred and country=iceland"
-msgstr "Geavanceerd voorbeeld (Engels): name=jan en country=nederland"
-
-#: ../../include/contact_widgets.php:57 ../../include/features.php:97
-#: ../../include/widgets.php:310
-msgid "Saved Folders"
-msgstr "Bewaarde mappen"
-
-#: ../../include/contact_widgets.php:60 ../../include/contact_widgets.php:98
-#: ../../include/widgets.php:313
-msgid "Everything"
-msgstr "Alles"
-
-#: ../../include/contact_widgets.php:95 ../../include/widgets.php:46
-#: ../../include/taxonomy.php:282
-msgid "Categories"
-msgstr "Categorieën"
-
-#: ../../include/contact_widgets.php:128
-#, 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:133
-msgid "show more"
-msgstr "meer connecties weergeven"
-
 #: ../../include/attach.php:247 ../../include/attach.php:333
 msgid "Item was not found."
 msgstr "Item niet gevonden"
@@ -7980,7 +7649,7 @@ msgstr "Leeftijd:"
 msgid "YYYY-MM-DD or MM-DD"
 msgstr "JJJJ-MM-DD of MM-DD"
 
-#: ../../include/datetime.php:273 ../../boot.php:2445
+#: ../../include/datetime.php:273 ../../boot.php:2463
 msgid "never"
 msgstr "nooit"
 
@@ -8069,23 +7738,6 @@ msgstr "Alleen openbare forums"
 msgid "This Website Only"
 msgstr "Alleen deze hub"
 
-#: ../../include/enotify.php:57 ../../include/network.php:1827
-msgid "$Projectname Notification"
-msgstr "$Projectname-notificatie"
-
-#: ../../include/enotify.php:58 ../../include/network.php:1828
-msgid "$projectname"
-msgstr "$projectname"
-
-#: ../../include/enotify.php:60 ../../include/network.php:1830
-msgid "Thank You,"
-msgstr "Bedankt,"
-
-#: ../../include/enotify.php:62 ../../include/network.php:1832
-#, php-format
-msgid "%s Administrator"
-msgstr "Beheerder %s"
-
 #: ../../include/enotify.php:96
 #, php-format
 msgid "%s <!item_type!>"
@@ -8265,29 +7917,180 @@ msgstr "Bezoek %s om het voorstel te accepteren of af te wijzen."
 msgid "[Hubzilla:Notify]"
 msgstr "[Hubzilla:Notificatie]"
 
-#: ../../include/event.php:779
-msgid "This event has been added to your calendar."
-msgstr "Dit evenement is aan jouw agenda toegevoegd."
+#: ../../include/ItemObject.php:89 ../../include/conversation.php:664
+msgid "Private Message"
+msgstr "Niet voor iedereen zichtbaar"
 
-#: ../../include/event.php:978
-msgid "Not specified"
-msgstr "Niet aangegeven"
+#: ../../include/ItemObject.php:126 ../../include/conversation.php:656
+msgid "Select"
+msgstr "Kies"
 
-#: ../../include/event.php:979
-msgid "Needs Action"
-msgstr "Actie vereist"
+#: ../../include/ItemObject.php:130
+msgid "Save to Folder"
+msgstr "In map opslaan"
 
-#: ../../include/event.php:980
-msgid "Completed"
-msgstr "Voltooid"
+#: ../../include/ItemObject.php:151
+msgid "I will attend"
+msgstr "Aanwezig"
 
-#: ../../include/event.php:981
-msgid "In Process"
-msgstr "In behandeling"
+#: ../../include/ItemObject.php:151
+msgid "I will not attend"
+msgstr "Niet aanwezig"
 
-#: ../../include/event.php:982
-msgid "Cancelled"
-msgstr "Geannuleerd"
+#: ../../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"
+
+#: ../../include/ItemObject.php:319
+msgid "to"
+msgstr "aan"
+
+#: ../../include/ItemObject.php:320
+msgid "via"
+msgstr "via"
+
+#: ../../include/ItemObject.php:321
+msgid "Wall-to-Wall"
+msgstr "Kanaal-naar-kanaal"
+
+#: ../../include/ItemObject.php:322
+msgid "via Wall-To-Wall:"
+msgstr "via kanaal-naar-kanaal"
+
+#: ../../include/ItemObject.php:334 ../../include/conversation.php:719
+#, php-format
+msgid "from %s"
+msgstr "van %s"
+
+#: ../../include/ItemObject.php:337 ../../include/conversation.php:722
+#, php-format
+msgid "last edited: %s"
+msgstr "laatst bewerkt: %s"
+
+#: ../../include/ItemObject.php:338 ../../include/conversation.php:723
+#, 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"
 
 #: ../../include/features.php:48
 msgid "General Features"
@@ -8476,10 +8279,6 @@ msgstr "Privacygroepen"
 msgid "Enable management and selection of privacy groups"
 msgstr "Beheer en selectie van privacygroepen inschakelen"
 
-#: ../../include/features.php:84 ../../include/widgets.php:281
-msgid "Saved Searches"
-msgstr "Opgeslagen zoekopdrachten"
-
 #: ../../include/features.php:84
 msgid "Save search terms for re-use"
 msgstr "Sla zoekopdrachten op voor hergebruik"
@@ -8516,7 +8315,7 @@ 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/features.php:89 ../../include/apps.php:162
 msgid "Suggest Channels"
 msgstr "Kanalen voorstellen"
 
@@ -8627,21 +8426,17 @@ msgstr "Privacygroep toevoegen"
 msgid "Channels not in any privacy group"
 msgstr "Kanalen die zich in geen enkele privacygroep bevinden"
 
-#: ../../include/group.php:316 ../../include/widgets.php:282
-msgid "add"
-msgstr "toevoegen"
-
-#: ../../include/bbcode.php:123 ../../include/bbcode.php:813
-#: ../../include/bbcode.php:816 ../../include/bbcode.php:821
-#: ../../include/bbcode.php:824 ../../include/bbcode.php:827
-#: ../../include/bbcode.php:830 ../../include/bbcode.php:835
-#: ../../include/bbcode.php:838 ../../include/bbcode.php:843
-#: ../../include/bbcode.php:846 ../../include/bbcode.php:849
-#: ../../include/bbcode.php:852
+#: ../../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:863
+#: ../../include/bbcode.php:162 ../../include/bbcode.php:898
 msgid "Encrypted content"
 msgstr "Versleutelde inhoud"
 
@@ -8670,353 +8465,723 @@ msgstr "Klik om te openen of te sluiten"
 msgid "spoiler"
 msgstr "spoiler"
 
-#: ../../include/bbcode.php:556
+#: ../../include/bbcode.php:586
 msgid "Different viewers will see this text differently"
 msgstr "Deze tekst wordt per persoon anders weergeven."
 
-#: ../../include/bbcode.php:801
+#: ../../include/bbcode.php:836
 msgid "$1 wrote:"
 msgstr "$1 schreef:"
 
-#: ../../include/items.php:1138 ../../include/items.php:1183
-msgid "(Unknown)"
-msgstr "(Onbekend)"
-
-#: ../../include/items.php:1382
-msgid "Visible to anybody on the internet."
-msgstr "Voor iedereen op het internet zichtbaar."
-
-#: ../../include/items.php:1384
-msgid "Visible to you only."
-msgstr "Alleen voor jou zichtbaar."
-
-#: ../../include/items.php:1386
-msgid "Visible to anybody in this network."
-msgstr "Voor iedereen in dit netwerk zichtbaar."
-
-#: ../../include/items.php:1388
-msgid "Visible to anybody authenticated."
-msgstr "Voor iedereen die geauthenticeerd is zichtbaar."
-
-#: ../../include/items.php:1390
+#: ../../include/conversation.php:204
 #, php-format
-msgid "Visible to anybody on %s."
-msgstr "Voor iedereen op %s zichtbaar."
+msgid "%1$s is now connected with %2$s"
+msgstr "%1$s is nu met %2$s verbonden"
 
-#: ../../include/items.php:1392
-msgid "Visible to all connections."
-msgstr "Voor alle connecties zichtbaar."
-
-#: ../../include/items.php:1394
-msgid "Visible to approved connections."
-msgstr "Voor alle geaccepteerde connecties zichtbaar."
-
-#: ../../include/items.php:1396
-msgid "Visible to specific connections."
-msgstr "Voor specifieke connecties zichtbaar."
-
-#: ../../include/items.php:5142
-msgid "Privacy group is empty."
-msgstr "Privacygroep is leeg"
-
-#: ../../include/items.php:5149
+#: ../../include/conversation.php:239
 #, php-format
-msgid "Privacy group: %s"
-msgstr "Privacygroep: %s"
+msgid "%1$s poked %2$s"
+msgstr "%1$s heeft %2$s aangestoten"
 
-#: ../../include/items.php:5161
-msgid "Connection not found."
-msgstr "Connectie niet gevonden."
+#: ../../include/conversation.php:243 ../../include/text.php:1021
+#: ../../include/text.php:1026
+msgid "poked"
+msgstr "aangestoten"
 
-#: ../../include/items.php:5594
-msgid "profile photo"
-msgstr "profielfoto"
-
-#: ../../include/network.php:659
-msgid "view full size"
-msgstr "volledige grootte tonen"
-
-#: ../../include/network.php:1889
-msgid "No Subject"
-msgstr "Geen onderwerp"
-
-#: ../../include/widgets.php:103
-msgid "System"
-msgstr "Systeem"
-
-#: ../../include/widgets.php:106
-msgid "Create Personal App"
-msgstr "Persoonlijke app maken"
-
-#: ../../include/widgets.php:107
-msgid "Edit Personal App"
-msgstr "Persoonlijke app bewerken"
-
-#: ../../include/widgets.php:154
-msgid "Suggestions"
-msgstr "Voorgestelde kanalen"
-
-#: ../../include/widgets.php:155
-msgid "See more..."
-msgstr "Meer..."
-
-#: ../../include/widgets.php:175
+#: ../../include/conversation.php:691
 #, php-format
-msgid "You have %1$.0f of %2$.0f allowed connections."
-msgstr "Je hebt %1$.0f van de %2$.0f toegestane connecties."
+msgid "View %s's profile @ %s"
+msgstr "Bekijk het profiel van %s @ %s"
 
-#: ../../include/widgets.php:181
-msgid "Add New Connection"
-msgstr "Nieuwe connectie toevoegen"
+#: ../../include/conversation.php:710
+msgid "Categories:"
+msgstr "Categorieën:"
 
-#: ../../include/widgets.php:182
-msgid "Enter channel address"
-msgstr "Vul kanaaladres in"
+#: ../../include/conversation.php:711
+msgid "Filed under:"
+msgstr "Bewaard onder:"
 
-#: ../../include/widgets.php:183
-msgid "Examples: bob@example.com, https://example.com/barbara"
-msgstr "Voorbeelden: bob@example.com, http://example.com/barbara"
+#: ../../include/conversation.php:738
+msgid "View in context"
+msgstr "In context bekijken"
 
-#: ../../include/widgets.php:199
-msgid "Notes"
-msgstr "Aantekeningen"
+#: ../../include/conversation.php:850
+msgid "remove"
+msgstr "verwijderen"
 
-#: ../../include/widgets.php:273
-msgid "Remove term"
-msgstr "Verwijder zoekterm"
+#: ../../include/conversation.php:855
+msgid "Delete Selected Items"
+msgstr "Verwijder de geselecteerde items"
 
-#: ../../include/widgets.php:354
-msgid "Archives"
-msgstr "Archieven"
+#: ../../include/conversation.php:953
+msgid "View Source"
+msgstr "Bron weergeven"
 
-#: ../../include/widgets.php:467
-msgid "Refresh"
-msgstr "Vernieuwen"
+#: ../../include/conversation.php:954
+msgid "Follow Thread"
+msgstr "Conversatie volgen"
 
-#: ../../include/widgets.php:507
-msgid "Account settings"
-msgstr "Account"
+#: ../../include/conversation.php:955
+msgid "Unfollow Thread"
+msgstr "Conversatie niet meer volgen"
 
-#: ../../include/widgets.php:513
-msgid "Channel settings"
-msgstr "Kanaal"
+#: ../../include/conversation.php:960
+msgid "Activity/Posts"
+msgstr "Activiteit/berichten connectie"
 
-#: ../../include/widgets.php:522
-msgid "Additional features"
-msgstr "Extra functies"
+#: ../../include/conversation.php:962
+msgid "Edit Connection"
+msgstr "Connectie bewerken"
 
-#: ../../include/widgets.php:529
-msgid "Feature/Addon settings"
-msgstr "Plugin-instellingen"
+#: ../../include/conversation.php:963
+msgid "Message"
+msgstr "Bericht"
 
-#: ../../include/widgets.php:535
-msgid "Display settings"
-msgstr "Weergave"
+#: ../../include/conversation.php:1080
+#, php-format
+msgid "%s likes this."
+msgstr "%s vindt dit leuk."
 
-#: ../../include/widgets.php:542
-msgid "Manage locations"
-msgstr "Locaties beheren"
+#: ../../include/conversation.php:1080
+#, php-format
+msgid "%s doesn't like this."
+msgstr "%s vindt dit niet leuk."
 
-#: ../../include/widgets.php:551
-msgid "Export channel"
-msgstr "Kanaal exporteren"
+#: ../../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/widgets.php:558
-msgid "Connected apps"
-msgstr "Verbonden applicaties"
+#: ../../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/widgets.php:573
-msgid "Premium Channel Settings"
-msgstr "Instellingen premiumkanaal"
+#: ../../include/conversation.php:1092
+msgid "and"
+msgstr "en"
 
-#: ../../include/widgets.php:602
-msgid "Private Mail Menu"
-msgstr "Privéberichten"
+#: ../../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/widgets.php:604
-msgid "Combined View"
-msgstr "Gecombineerd postvak"
+#: ../../include/conversation.php:1096
+#, php-format
+msgid "%s like this."
+msgstr "%s vinden dit leuk."
 
-#: ../../include/widgets.php:609 ../../include/nav.php:196
-msgid "Inbox"
-msgstr "Postvak IN"
+#: ../../include/conversation.php:1096
+#, php-format
+msgid "%s don't like this."
+msgstr "%s vinden dit niet leuk."
 
-#: ../../include/widgets.php:614 ../../include/nav.php:197
-msgid "Outbox"
-msgstr "Postvak UIT"
+#: ../../include/conversation.php:1136
+msgid "Set your location"
+msgstr "Locatie instellen"
 
-#: ../../include/widgets.php:619 ../../include/nav.php:198
-msgid "New Message"
-msgstr "Nieuw bericht"
+#: ../../include/conversation.php:1137
+msgid "Clear browser location"
+msgstr "Locatie van webbrowser wissen"
 
-#: ../../include/widgets.php:636 ../../include/widgets.php:648
-msgid "Conversations"
-msgstr "Conversaties"
+#: ../../include/conversation.php:1183
+msgid "Tag term:"
+msgstr "Tag:"
 
-#: ../../include/widgets.php:640
-msgid "Received Messages"
-msgstr "Ontvangen berichten"
+#: ../../include/conversation.php:1184
+msgid "Where are you right now?"
+msgstr "Waar bevind je je op dit moment?"
 
-#: ../../include/widgets.php:644
-msgid "Sent Messages"
-msgstr "Verzonden berichten"
+#: ../../include/conversation.php:1216
+msgid "Page link name"
+msgstr "Linknaam pagina"
 
-#: ../../include/widgets.php:658
-msgid "No messages."
-msgstr "Geen berichten"
+#: ../../include/conversation.php:1219
+msgid "Post as"
+msgstr "Bericht plaatsen als"
 
-#: ../../include/widgets.php:676
-msgid "Delete conversation"
-msgstr "Verwijder conversatie"
+#: ../../include/conversation.php:1229
+msgid "Toggle voting"
+msgstr "Peiling in- of uitschakelen"
 
-#: ../../include/widgets.php:702
-msgid "Events Menu"
-msgstr "Agenda-menu"
+#: ../../include/conversation.php:1237
+msgid "Categories (optional, comma-separated list)"
+msgstr "Categorieën (optioneel, door komma's gescheiden lijst)"
 
-#: ../../include/widgets.php:703
-msgid "Day View"
-msgstr "Dag tonen"
+#: ../../include/conversation.php:1260
+msgid "Set publish date"
+msgstr "Publicatiedatum instellen"
 
-#: ../../include/widgets.php:704
-msgid "Week View"
-msgstr "Week tonen"
+#: ../../include/conversation.php:1264
+msgid "OK"
+msgstr "OK"
 
-#: ../../include/widgets.php:705
-msgid "Month View"
-msgstr "Maand tonen"
+#: ../../include/conversation.php:1509
+msgid "Discover"
+msgstr "Ontdekken"
 
-#: ../../include/widgets.php:717
-msgid "Events Tools"
-msgstr "Agenda-hulpmiddelen"
+#: ../../include/conversation.php:1512
+msgid "Imported public streams"
+msgstr "Openbare streams importeren"
 
-#: ../../include/widgets.php:718
-msgid "Export Calendar"
-msgstr "Exporteren"
+#: ../../include/conversation.php:1517
+msgid "Commented Order"
+msgstr "Nieuwe reacties bovenaan"
 
-#: ../../include/widgets.php:719
-msgid "Import Calendar"
-msgstr "Importeren"
+#: ../../include/conversation.php:1520
+msgid "Sort by Comment Date"
+msgstr "Berichten met nieuwe reacties bovenaan"
 
-#: ../../include/widgets.php:798
-msgid "Overview"
-msgstr "Overzicht"
+#: ../../include/conversation.php:1524
+msgid "Posted Order"
+msgstr "Nieuwe berichten bovenaan"
 
-#: ../../include/widgets.php:805
-msgid "Chat Members"
-msgstr "Chatleden"
+#: ../../include/conversation.php:1527
+msgid "Sort by Post Date"
+msgstr "Nieuwe berichten bovenaan"
 
-#: ../../include/widgets.php:828
-msgid "Bookmarked Chatrooms"
-msgstr "Bladwijzers van chatkanalen"
+#: ../../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/widgets.php:851
-msgid "Suggested Chatrooms"
-msgstr "Voorgestelde chatkanalen"
+#: ../../include/conversation.php:1544
+msgid "Activity Stream - by date"
+msgstr "Activiteitenstroom - volgens datum"
 
-#: ../../include/widgets.php:996 ../../include/widgets.php:1108
-msgid "photo/image"
-msgstr "foto/afbeelding"
+#: ../../include/conversation.php:1550
+msgid "Starred"
+msgstr "Met ster"
 
-#: ../../include/widgets.php:1051
-msgid "Click to show more"
-msgstr "Klik voor meer"
+#: ../../include/conversation.php:1553
+msgid "Favourite Posts"
+msgstr "Favoriete berichten"
 
-#: ../../include/widgets.php:1202
-msgid "Rating Tools"
-msgstr "Beoordelingen"
+#: ../../include/conversation.php:1560
+msgid "Spam"
+msgstr "Spam"
 
-#: ../../include/widgets.php:1206 ../../include/widgets.php:1208
-msgid "Rate Me"
-msgstr "Beoordeel mij"
+#: ../../include/conversation.php:1563
+msgid "Posts flagged as SPAM"
+msgstr "Berichten gemarkeerd als SPAM"
 
-#: ../../include/widgets.php:1211
-msgid "View Ratings"
-msgstr "Bekijk beoordelingen"
+#: ../../include/conversation.php:1620
+msgid "Status Messages and Posts"
+msgstr "Berichten in dit kanaal"
 
-#: ../../include/widgets.php:1268
-msgid "Forums"
-msgstr "Forums"
+#: ../../include/conversation.php:1629
+msgid "About"
+msgstr "Over"
 
-#: ../../include/widgets.php:1297
-msgid "Tasks"
-msgstr "Taken"
+#: ../../include/conversation.php:1632
+msgid "Profile Details"
+msgstr "Profiel"
 
-#: ../../include/widgets.php:1306
-msgid "Documentation"
-msgstr "Documentatie"
+#: ../../include/conversation.php:1648
+msgid "Files and Storage"
+msgstr "Bestanden en opslagruimte"
 
-#: ../../include/widgets.php:1308
-msgid "Project/Site Information"
-msgstr "Project- en hub-informatie"
+#: ../../include/conversation.php:1685
+msgid "Saved Bookmarks"
+msgstr "Opgeslagen bladwijzers"
 
-#: ../../include/widgets.php:1309
-msgid "For Members"
-msgstr "Voor leden"
+#: ../../include/conversation.php:1695
+msgid "Manage Webpages"
+msgstr "Webpagina's beheren"
 
-#: ../../include/widgets.php:1310
-msgid "For Administrators"
-msgstr "Voor beheerders"
+#: ../../include/conversation.php:1754
+msgctxt "noun"
+msgid "Attending"
+msgid_plural "Attending"
+msgstr[0] "aanwezig"
+msgstr[1] "aanwezig"
 
-#: ../../include/widgets.php:1311
-msgid "For Developers"
-msgstr "Voor ontwikkelaars"
+#: ../../include/conversation.php:1757
+msgctxt "noun"
+msgid "Not Attending"
+msgid_plural "Not Attending"
+msgstr[0] "niet aanwezig"
+msgstr[1] "niet aanwezig"
 
-#: ../../include/widgets.php:1335
-msgid "Accounts"
-msgstr "Accounts"
+#: ../../include/conversation.php:1760
+msgctxt "noun"
+msgid "Undecided"
+msgid_plural "Undecided"
+msgstr[0] "nog niet beslist"
+msgstr[1] "nog niet beslist"
 
-#: ../../include/widgets.php:1335 ../../include/widgets.php:1373
-msgid "Member registrations waiting for confirmation"
-msgstr "Accounts die op goedkeuring wachten"
+#: ../../include/conversation.php:1763
+msgctxt "noun"
+msgid "Agree"
+msgid_plural "Agrees"
+msgstr[0] "eens"
+msgstr[1] "eens"
 
-#: ../../include/widgets.php:1341
-msgid "Inspect queue"
-msgstr "Inspecteer berichtenwachtrij"
+#: ../../include/conversation.php:1766
+msgctxt "noun"
+msgid "Disagree"
+msgid_plural "Disagrees"
+msgstr[0] "oneens"
+msgstr[1] "oneens"
 
-#: ../../include/widgets.php:1343
-msgid "DB updates"
-msgstr "Database-updates"
+#: ../../include/conversation.php:1769
+msgctxt "noun"
+msgid "Abstain"
+msgid_plural "Abstains"
+msgstr[0] "onthouding"
+msgstr[1] "onthoudingen"
 
-#: ../../include/widgets.php:1368 ../../include/nav.php:216
-msgid "Admin"
-msgstr "Beheer"
+#: ../../include/text.php:423
+msgid "prev"
+msgstr "vorige"
 
-#: ../../include/widgets.php:1369
-msgid "Plugin Features"
-msgstr "Plugin-opties"
+#: ../../include/text.php:425
+msgid "first"
+msgstr "eerste"
 
-#: ../../include/taxonomy.php:240 ../../include/taxonomy.php:261
+#: ../../include/text.php:454
+msgid "last"
+msgstr "laatste"
+
+#: ../../include/text.php:457
+msgid "next"
+msgstr "volgende"
+
+#: ../../include/text.php:467
+msgid "older"
+msgstr "ouder"
+
+#: ../../include/text.php:469
+msgid "newer"
+msgstr "nieuwer"
+
+#: ../../include/text.php:851
+msgid "No connections"
+msgstr "Geen connecties"
+
+#: ../../include/text.php:876
+#, php-format
+msgid "View all %s connections"
+msgstr "Toon alle %s connecties"
+
+#: ../../include/text.php:1021 ../../include/text.php:1026
+msgid "poke"
+msgstr "aanstoten"
+
+#: ../../include/text.php:1027
+msgid "ping"
+msgstr "ping"
+
+#: ../../include/text.php:1027
+msgid "pinged"
+msgstr "gepingd"
+
+#: ../../include/text.php:1028
+msgid "prod"
+msgstr "por"
+
+#: ../../include/text.php:1028
+msgid "prodded"
+msgstr "gepord"
+
+#: ../../include/text.php:1029
+msgid "slap"
+msgstr "slaan"
+
+#: ../../include/text.php:1029
+msgid "slapped"
+msgstr "sloeg"
+
+#: ../../include/text.php:1030
+msgid "finger"
+msgstr "finger"
+
+#: ../../include/text.php:1030
+msgid "fingered"
+msgstr "gefingerd"
+
+#: ../../include/text.php:1031
+msgid "rebuff"
+msgstr "afpoeieren"
+
+#: ../../include/text.php:1031
+msgid "rebuffed"
+msgstr "afgepoeierd"
+
+#: ../../include/text.php:1043
+msgid "happy"
+msgstr "gelukkig"
+
+#: ../../include/text.php:1044
+msgid "sad"
+msgstr "bedroefd"
+
+#: ../../include/text.php:1045
+msgid "mellow"
+msgstr "mellow"
+
+#: ../../include/text.php:1046
+msgid "tired"
+msgstr "moe"
+
+#: ../../include/text.php:1047
+msgid "perky"
+msgstr "parmantig"
+
+#: ../../include/text.php:1048
+msgid "angry"
+msgstr "boos"
+
+#: ../../include/text.php:1049
+msgid "stupefied"
+msgstr "verbijsterd"
+
+#: ../../include/text.php:1050
+msgid "puzzled"
+msgstr "verward"
+
+#: ../../include/text.php:1051
+msgid "interested"
+msgstr "geïnteresseerd"
+
+#: ../../include/text.php:1052
+msgid "bitter"
+msgstr "verbitterd"
+
+#: ../../include/text.php:1053
+msgid "cheerful"
+msgstr "vrolijk"
+
+#: ../../include/text.php:1054
+msgid "alive"
+msgstr "levendig"
+
+#: ../../include/text.php:1055
+msgid "annoyed"
+msgstr "geërgerd"
+
+#: ../../include/text.php:1056
+msgid "anxious"
+msgstr "bezorgd"
+
+#: ../../include/text.php:1057
+msgid "cranky"
+msgstr "humeurig"
+
+#: ../../include/text.php:1058
+msgid "disturbed"
+msgstr "verontrust"
+
+#: ../../include/text.php:1059
+msgid "frustrated"
+msgstr "gefrustreerd "
+
+#: ../../include/text.php:1060
+msgid "depressed"
+msgstr "gedeprimeerd"
+
+#: ../../include/text.php:1061
+msgid "motivated"
+msgstr "gemotiveerd"
+
+#: ../../include/text.php:1062
+msgid "relaxed"
+msgstr "ontspannen"
+
+#: ../../include/text.php:1063
+msgid "surprised"
+msgstr "verrast"
+
+#: ../../include/text.php:1235 ../../include/js_strings.php:70
+msgid "Monday"
+msgstr "maandag"
+
+#: ../../include/text.php:1235 ../../include/js_strings.php:71
+msgid "Tuesday"
+msgstr "dinsdag"
+
+#: ../../include/text.php:1235 ../../include/js_strings.php:72
+msgid "Wednesday"
+msgstr "woensdag"
+
+#: ../../include/text.php:1235 ../../include/js_strings.php:73
+msgid "Thursday"
+msgstr "donderdag"
+
+#: ../../include/text.php:1235 ../../include/js_strings.php:74
+msgid "Friday"
+msgstr "vrijdag"
+
+#: ../../include/text.php:1235 ../../include/js_strings.php:75
+msgid "Saturday"
+msgstr "zaterdag"
+
+#: ../../include/text.php:1235 ../../include/js_strings.php:69
+msgid "Sunday"
+msgstr "zondag"
+
+#: ../../include/text.php:1239 ../../include/js_strings.php:45
+msgid "January"
+msgstr "januari"
+
+#: ../../include/text.php:1239 ../../include/js_strings.php:46
+msgid "February"
+msgstr "februari"
+
+#: ../../include/text.php:1239 ../../include/js_strings.php:47
+msgid "March"
+msgstr "maart"
+
+#: ../../include/text.php:1239 ../../include/js_strings.php:48
+msgid "April"
+msgstr "april"
+
+#: ../../include/text.php:1239
+msgid "May"
+msgstr "mei"
+
+#: ../../include/text.php:1239 ../../include/js_strings.php:50
+msgid "June"
+msgstr "juni"
+
+#: ../../include/text.php:1239 ../../include/js_strings.php:51
+msgid "July"
+msgstr "juli"
+
+#: ../../include/text.php:1239 ../../include/js_strings.php:52
+msgid "August"
+msgstr "augustus"
+
+#: ../../include/text.php:1239 ../../include/js_strings.php:53
+msgid "September"
+msgstr "september"
+
+#: ../../include/text.php:1239 ../../include/js_strings.php:54
+msgid "October"
+msgstr "oktober"
+
+#: ../../include/text.php:1239 ../../include/js_strings.php:55
+msgid "November"
+msgstr "november"
+
+#: ../../include/text.php:1239 ../../include/js_strings.php:56
+msgid "December"
+msgstr "december"
+
+#: ../../include/text.php:1316 ../../include/text.php:1320
+msgid "Unknown Attachment"
+msgstr "Onbekende bijlage"
+
+#: ../../include/text.php:1322
+msgid "unknown"
+msgstr "onbekend"
+
+#: ../../include/text.php:1358
+msgid "remove category"
+msgstr "categorie verwijderen"
+
+#: ../../include/text.php:1435
+msgid "remove from file"
+msgstr "uit map verwijderen"
+
+#: ../../include/text.php:1764 ../../include/text.php:1836
+msgid "default"
+msgstr "standaard"
+
+#: ../../include/text.php:1772
+msgid "Page layout"
+msgstr "Pagina-lay-out"
+
+#: ../../include/text.php:1772
+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
+msgid "Page content type"
+msgstr "Opmaaktype pagina"
+
+#: ../../include/text.php:1848
+msgid "Select an alternate language"
+msgstr "Kies een andere taal"
+
+#: ../../include/text.php:1965
+msgid "activity"
+msgstr "activiteit"
+
+#: ../../include/text.php:2274
+msgid "Design Tools"
+msgstr "Ontwerp-hulpmiddelen"
+
+#: ../../include/text.php:2280
+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/account.php:414
+msgid "Account approved."
+msgstr "Account goedgekeurd"
+
+#: ../../include/account.php:454
+#, 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."
+
+#: ../../include/account.php:735
+msgid "This action is not available under your subscription plan."
+msgstr "Deze handeling is niet mogelijk met jouw abonnement."
+
+#: ../../include/taxonomy.php:228 ../../include/taxonomy.php:249
 msgid "Tags"
 msgstr "Tags"
 
-#: ../../include/taxonomy.php:305
+#: ../../include/taxonomy.php:293
 msgid "Keywords"
 msgstr "Trefwoorden"
 
-#: ../../include/taxonomy.php:326
+#: ../../include/taxonomy.php:314
 msgid "have"
 msgstr "heb"
 
-#: ../../include/taxonomy.php:326
+#: ../../include/taxonomy.php:314
 msgid "has"
 msgstr "heeft"
 
-#: ../../include/taxonomy.php:327
+#: ../../include/taxonomy.php:315
 msgid "want"
 msgstr "wil"
 
-#: ../../include/taxonomy.php:327
+#: ../../include/taxonomy.php:315
 msgid "wants"
 msgstr "wil"
 
-#: ../../include/taxonomy.php:328
+#: ../../include/taxonomy.php:316
 msgid "likes"
 msgstr "vindt dit leuk"
 
-#: ../../include/taxonomy.php:329
+#: ../../include/taxonomy.php:317
 msgid "dislikes"
 msgstr "vindt dit niet leuk"
 
+#: ../../include/PermissionDescription.php:115
+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:124
+msgid "Only me (only specified contacts and me)"
+msgstr "Alleen ik en specifieke connecties"
+
+#: ../../include/PermissionDescription.php:125
+msgid "Anybody authenticated (could include visitors from other networks)"
+msgstr "Geauthenticeerde leden  (kan bezoekers van andere netwerken bevatten)"
+
+#: ../../include/PermissionDescription.php:126
+msgid "Any connections including those who haven't yet been approved"
+msgstr "Al mijn geaccepteerde en nog niet geaccepteerde connecties"
+
+#: ../../include/PermissionDescription.php:169
+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:170
+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:171
+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:172
+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:173
+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?"
@@ -9041,6 +9206,10 @@ msgstr "Wachtwoord te kort"
 msgid "Passwords do not match"
 msgstr "Wachtwoorden komen niet overeen"
 
+#: ../../include/js_strings.php:13
+msgid "everybody"
+msgstr "iedereen"
+
 #: ../../include/js_strings.php:14
 msgid "Secret Passphrase"
 msgstr "Geheim wachtwoord"
@@ -9273,174 +9442,9 @@ msgstr "Afzender kan niet bepaald worden."
 msgid "Stored post could not be verified."
 msgstr "Opgeslagen bericht kon niet worden geverifieerd."
 
-#: ../../include/nav.php:82 ../../include/nav.php:113 ../../boot.php:1614
-msgid "Logout"
-msgstr "Uitloggen"
-
-#: ../../include/nav.php:82 ../../include/nav.php:113
-msgid "End this session"
-msgstr "Beëindig deze sessie"
-
-#: ../../include/nav.php:85 ../../include/nav.php:144
-msgid "Home"
-msgstr "Home"
-
-#: ../../include/nav.php:85
-msgid "Your posts and conversations"
-msgstr "Jouw kanaal"
-
-#: ../../include/nav.php:86
-msgid "Your profile page"
-msgstr "Jouw profielpagina"
-
-#: ../../include/nav.php:88
-msgid "Manage/Edit profiles"
-msgstr "Beheer/wijzig profielen"
-
-#: ../../include/nav.php:90
-msgid "Edit your profile"
-msgstr "Jouw profiel bewerken"
-
-#: ../../include/nav.php:92
-msgid "Your photos"
-msgstr "Jouw foto's"
-
-#: ../../include/nav.php:93
-msgid "Your files"
-msgstr "Jouw bestanden"
-
-#: ../../include/nav.php:96
-msgid "Your chatrooms"
-msgstr "Jouw chatkanalen"
-
-#: ../../include/nav.php:102
-msgid "Your bookmarks"
-msgstr "Jouw bladwijzers"
-
-#: ../../include/nav.php:106
-msgid "Your webpages"
-msgstr "Jouw webpagina's"
-
-#: ../../include/nav.php:110
-msgid "Sign in"
-msgstr "Inloggen"
-
-#: ../../include/nav.php:127
-#, php-format
-msgid "%s - click to logout"
-msgstr "%s - klik om uit te loggen"
-
-#: ../../include/nav.php:130
-msgid "Remote authentication"
-msgstr "Authenticatie op afstand"
-
-#: ../../include/nav.php:130
-msgid "Click to authenticate to your home hub"
-msgstr "Authenticeer jezelf via (bijvoorbeeld) jouw hub"
-
-#: ../../include/nav.php:144
-msgid "Home Page"
-msgstr "Homepage"
-
-#: ../../include/nav.php:147
-msgid "Create an account"
-msgstr "Maak een account aan"
-
-#: ../../include/nav.php:159
-msgid "Help and documentation"
-msgstr "Hulp en documentatie"
-
-#: ../../include/nav.php:163
-msgid "Applications, utilities, links, games"
-msgstr "Apps"
-
-#: ../../include/nav.php:165
-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
-msgid "Channel Directory"
-msgstr "Kanalengids"
-
-#: ../../include/nav.php:179
-msgid "Your grid"
-msgstr "Jouw grid"
-
-#: ../../include/nav.php:180
-msgid "Mark all grid notifications seen"
-msgstr "Markeer alle gridnotificaties als bekeken"
-
-#: ../../include/nav.php:182
-msgid "Channel home"
-msgstr "Jouw kanaal"
-
-#: ../../include/nav.php:183
-msgid "Mark all channel notifications seen"
-msgstr "Alle kanaalnotificaties als gelezen markeren"
-
-#: ../../include/nav.php:189
-msgid "Notices"
-msgstr "Notificaties"
-
-#: ../../include/nav.php:189
-msgid "Notifications"
-msgstr "Notificaties"
-
-#: ../../include/nav.php:190
-msgid "See all notifications"
-msgstr "Alle notificaties weergeven"
-
-#: ../../include/nav.php:193
-msgid "Private mail"
-msgstr "Privéberichten"
-
-#: ../../include/nav.php:194
-msgid "See all private messages"
-msgstr "Alle privéberichten weergeven"
-
-#: ../../include/nav.php:195
-msgid "Mark all private messages seen"
-msgstr "Markeer alle privéberichten als bekeken"
-
-#: ../../include/nav.php:201
-msgid "Event Calendar"
-msgstr "Agenda"
-
-#: ../../include/nav.php:202
-msgid "See all events"
-msgstr "Alle gebeurtenissen weergeven"
-
-#: ../../include/nav.php:203
-msgid "Mark all events seen"
-msgstr "Markeer alle gebeurtenissen als bekeken"
-
-#: ../../include/nav.php:206
-msgid "Manage Your Channels"
-msgstr "Beheer je kanalen"
-
-#: ../../include/nav.php:208
-msgid "Account/Channel Settings"
-msgstr "Account-/kanaal-instellingen"
-
-#: ../../include/nav.php:216
-msgid "Site Setup and Configuration"
-msgstr "Hub instellen en beheren"
-
-#: ../../include/nav.php:252
-msgid "@name, #tag, ?doc, content"
-msgstr "@kanaal, #tag, inhoud, ?hulp"
-
-#: ../../include/nav.php:253
-msgid "Please wait..."
-msgstr "Wachten aub..."
-
-#: ../../include/oembed.php:267
-msgid "Embedded content"
-msgstr "Ingesloten (embedded) inhoud"
-
-#: ../../include/oembed.php:276
-msgid "Embedding disabled"
-msgstr "Insluiten (embedding) uitgeschakeld"
+#: ../../include/api.php:1338
+msgid "Public Timeline"
+msgstr "Openbare tijdlijn"
 
 #: ../../include/page_widgets.php:6
 msgid "New Page"
@@ -9591,32 +9595,61 @@ msgstr "Speciaal - Groepsopslag"
 msgid "Custom/Expert Mode"
 msgstr "Expertmodus/handmatig aanpassen"
 
-#: ../../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/apps.php:155
+msgid "Site Admin"
+msgstr "Hubbeheerder"
 
-#: ../../include/photos.php:119
-msgid "Image file is empty."
-msgstr "Afbeeldingsbestand is leeg"
+#: ../../include/apps.php:156
+msgid "Bug Report"
+msgstr "Bugrapport"
 
-#: ../../include/photos.php:257
-msgid "Photo storage failed."
-msgstr "Foto kan niet worden opgeslagen"
+#: ../../include/apps.php:157
+msgid "View Bookmarks"
+msgstr "Bladwijzers bekijken"
 
-#: ../../include/photos.php:297
-msgid "a new photo"
-msgstr "een nieuwe foto"
+#: ../../include/apps.php:158
+msgid "My Chatrooms"
+msgstr "Mijn chatkanalen"
 
-#: ../../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/apps.php:160
+msgid "Firefox Share"
+msgstr "Firefox Share"
 
-#: ../../include/photos.php:510
-msgid "Upload New Photos"
-msgstr "Nieuwe foto's uploaden"
+#: ../../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
+msgid "$Projectname event notification:"
+msgstr "Notificatie $Projectname-gebeurtenis:"
 
 #: ../../view/theme/redbasic/php/config.php:82
 msgid "Focus (Hubzilla default)"
@@ -9792,24 +9825,24 @@ msgstr "Aangemeld blijven"
 msgid "Forgot your password?"
 msgstr "Wachtwoord vergeten?"
 
-#: ../../boot.php:2251
+#: ../../boot.php:2269
 msgid "toggle mobile"
 msgstr "mobiele weergave omschakelen"
 
-#: ../../boot.php:2404
+#: ../../boot.php:2422
 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:2407
+#: ../../boot.php:2425
 #, php-format
 msgid "[hubzilla] Website SSL error for %s"
 msgstr "[hubzilla] Probleem met SSL-certificaat voor %s"
 
-#: ../../boot.php:2444
+#: ../../boot.php:2462
 msgid "Cron/Scheduled tasks not running."
 msgstr "Cron is niet actief"
 
-#: ../../boot.php:2448
+#: ../../boot.php:2466
 #, 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 197756606..0560870a1 100644
--- a/view/nl/hstrings.php
+++ b/view/nl/hstrings.php
@@ -48,6 +48,7 @@ App::$strings["# Channels"] = "# Kanalen";
 App::$strings["# primary"] = "# primair";
 App::$strings["# clones"] = "# klonen";
 App::$strings["Message queues"] = "Berichtenwachtrij";
+App::$strings["Your software should be updated"] = "Jouw software moet worden bijgewerkt ";
 App::$strings["Administration"] = "Beheer";
 App::$strings["Summary"] = "Samenvatting";
 App::$strings["Registered accounts"] = "Geregistreerde accounts";
@@ -55,6 +56,8 @@ App::$strings["Pending registrations"] = "Accounts die op goedkeuring wachten";
 App::$strings["Registered channels"] = "Geregistreerde kanalen";
 App::$strings["Active plugins"] = "Ingeschakelde plugins";
 App::$strings["Version"] = "Versie";
+App::$strings["Repository version (master)"] = "Versie repository (master)";
+App::$strings["Repository version (dev)"] = "Versie repository (dev)";
 App::$strings["Site settings updated."] = "Hub-instellingen bijgewerkt.";
 App::$strings["Default"] = "Standaard";
 App::$strings["mobile"] = "mobiel";
@@ -140,17 +143,24 @@ App::$strings["for channel"] = "voor kanaal";
 App::$strings["on server"] = "op hub";
 App::$strings["Status"] = "Status";
 App::$strings["Server"] = "Hubbeheer";
+App::$strings["By default, unfiltered HTML is allowed in embedded media. This is inherently insecure."] = "Standaard is ongefilterde HTML in ingesloten (embedded) media toegestaan. Dit is inherent onveilig.";
+App::$strings["The recommended setting is to only allow unfiltered HTML from the following sites:"] = "Het wordt aanbevolen om alleen ongefilterde HTML van de volgende websites toe te staan:";
+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."] = "Alle andere ingesloten (embedded) inhoud wordt gefilterd, <strong>tenzij</strong> ingesloten (embedded) inhoud van een website expliciet wordt geblokkeerd.";
 App::$strings["Security"] = "Beveiliging";
 App::$strings["Block public"] = "Openbare toegang blokkeren";
 App::$strings["Check to block public access to all otherwise public personal pages on this site unless you are currently authenticated."] = "Vink dit aan om alle normaliter openbare persoonlijke pagina's op deze hub alleen toegankelijk te maken voor leden die zich hebben geauthenticeerd.";
+App::$strings["Set \"Transport Security\" HTTP header"] = "\"Transport Security\" HTTP-header inschakelen";
+App::$strings["Set \"Content Security Policy\" HTTP header"] = " \"Content Security Policy\" HTTP-header inschakelen";
 App::$strings["Allow communications only from these sites"] = "Alleen communicatie met deze hubs toestaan";
 App::$strings["One site per line. Leave empty to allow communication from anywhere by default"] = "Eén hub per regel. Laat leeg om communicatie standaard met alle hubs toe te staan";
 App::$strings["Block communications from these sites"] = "Communicatie met deze hubs blokkeren";
 App::$strings["Allow communications only from these channels"] = "Sta alleen communicatie toe met deze kanalen";
 App::$strings["One channel (hash) per line. Leave empty to allow from any channel by default"] = "Eén kanaal (hash) per regel. Laat leeg om communicatie standaard met alle kanalen toe te staan";
 App::$strings["Block communications from these channels"] = "Communicatie met deze kanalen blokkeren";
-App::$strings["Allow embedded HTML content only from these domains"] = "Alleen ingesloten (embedded) HTML vanaf deze domeinen toestaan";
-App::$strings["One site per line. Leave empty to allow from any site by default"] = "Eén per regel. Laat leeg om standaard vanaf elk domein toe te staan";
+App::$strings["Only allow embeds from secure (SSL) websites and links."] = "Alleen ingesloten (embedded) inhoud van veilige (SSL) websites en links toestaan.";
+App::$strings["Allow unfiltered embedded HTML content only from these domains"] = "Alleen ongefilterde ingesloten (embedded) HTML van deze websites toestaan";
+App::$strings["One site per line. By default embedded content is filtered."] = "Eén website per regel. Standaard wordt ingesloten (embedded) inhoud gefilterd.";
 App::$strings["Block embedded HTML from these domains"] = "Ingesloten (embedded) HTML vanaf deze domeinen blokkeren";
 App::$strings["Update has been marked successful"] = "Update is als succesvol gemarkeerd";
 App::$strings["Executing %s failed. Check system logs."] = "Uitvoeren van %s is mislukt. Controleer systeemlogboek.";
@@ -239,6 +249,18 @@ App::$strings["Maximum project version: "] = "Maximum versie Hubzilla:";
 App::$strings["Minimum PHP version: "] = "Minimum versie PHP: ";
 App::$strings["Requires: "] = "Vereist: ";
 App::$strings["Disabled - version incompatibility"] = "Uitgeschakeld - versie is incompatibel";
+App::$strings["Enter the public git repository URL of the plugin repo."] = "Vul de openbare Git-URL in van de plugin-repository.";
+App::$strings["Plugin repo git URL"] = "Git-URL plugin-repository";
+App::$strings["Custom repo name"] = "Handmatige repository-naam";
+App::$strings["(optional)"] = "(optioneel)";
+App::$strings["Download Plugin Repo"] = "Plugin-repository downloaden";
+App::$strings["Install new repo"] = "Nieuwe repository installeren";
+App::$strings["Install"] = "Installeren";
+App::$strings["Cancel"] = "Annuleren";
+App::$strings["Add Plugin Repo"] = "Plugin-repository toevoegen";
+App::$strings["Update"] = "Bijwerken";
+App::$strings["Switch branch"] = "Branch veranderen";
+App::$strings["Remove"] = "Verwijderen";
 App::$strings["No themes found."] = "Geen thema's gevonden";
 App::$strings["Screenshot"] = "Schermafdruk";
 App::$strings["Themes"] = "Thema's";
@@ -284,6 +306,7 @@ App::$strings["Location (URL) of app"] = "Locatie (URL) van app";
 App::$strings["Description"] = "Omschrijving";
 App::$strings["Photo icon URL"] = "URL van pictogram";
 App::$strings["80 x 80 pixels - optional"] = "80 x 80 pixels (optioneel)";
+App::$strings["Categories (optional, comma separated list)"] = "Categorieën (optioneel,  door komma's gescheiden lijst)";
 App::$strings["Version ID"] = "Versie-ID";
 App::$strings["Price of app"] = "Prijs van de app";
 App::$strings["Location (URL) to purchase app"] = "Locatie (URL) om de app aan te schaffen";
@@ -301,7 +324,6 @@ App::$strings["View"] = "Weergeven";
 App::$strings["Bookmark added"] = "Bladwijzer toegevoegd";
 App::$strings["My Bookmarks"] = "Mijn bladwijzers";
 App::$strings["My Connections Bookmarks"] = "Bladwijzers van mijn connecties";
-App::$strings["everybody"] = "iedereen";
 App::$strings["Permissions denied."] = "Permissies niet toegestaan";
 App::$strings["l, F j"] = "l j F";
 App::$strings["Link to Source"] = "Originele locatie";
@@ -316,7 +338,6 @@ App::$strings["You must be logged in to see this page."] = "Je moet zijn ingelog
 App::$strings["Posts and comments"] = "Berichten en reacties";
 App::$strings["Only posts"] = "Alleen berichten";
 App::$strings["Insufficient permissions.  Request redirected to profile page."] = "Onvoldoende permissies.  Doorgestuurd naar profielpagina.";
-App::$strings["Public"] = "Openbaar";
 App::$strings["Room not found"] = "Chatkanaal niet gevonden";
 App::$strings["Leave Room"] = "Chatkanaal verlaten";
 App::$strings["Delete Room"] = "Chatkanaal verwijderen";
@@ -467,7 +488,6 @@ App::$strings["select a photo from your photo albums"] = "Kies een foto uit jouw
 App::$strings["Crop Image"] = "Afbeelding bijsnijden";
 App::$strings["Please adjust the image cropping for optimum viewing."] = "Snij de afbeelding zo uit dat deze optimaal wordt weergegeven.";
 App::$strings["Done Editing"] = "Klaar met bewerken";
-App::$strings["\$Projectname channel"] = "\$Projectname-kanaal";
 App::$strings["Public access denied."] = "Openbare toegang geweigerd.";
 App::$strings["%d rating"] = array(
 	0 => "%d beoordeling",
@@ -516,41 +536,14 @@ App::$strings["mail recalled"] = "Privébericht ingetrokken";
 App::$strings["duplicate mail received"] = "dubbel privébericht ontvangen";
 App::$strings["mail delivered"] = "privébericht afgeleverd";
 App::$strings["Item not found"] = "Item niet gevonden";
-App::$strings["Delete block?"] = "Blok verwijderen";
-App::$strings["Bold"] = "Vet";
-App::$strings["Italic"] = "Cursief";
-App::$strings["Underline"] = "Onderstrepen";
-App::$strings["Quote"] = "Citeren";
-App::$strings["Code"] = "Broncode";
-App::$strings["Attach file"] = "Bestand toevoegen";
-App::$strings["Permission settings"] = "Permissies";
-App::$strings["Public post"] = "Openbaar bericht";
 App::$strings["Title (optional)"] = "Titel (optioneel)";
-App::$strings["Categories (optional, comma-separated list)"] = "Categorieën (optioneel, door komma's gescheiden lijst)";
-App::$strings["Example: bob@example.com, mary@example.com"] = "Voorbeeld: bob@voorbeeld.nl, mary@voorbeeld.be";
-App::$strings["Preview"] = "Voorvertoning";
 App::$strings["Edit Block"] = "Blok bewerken";
-App::$strings["Delete layout?"] = "Lay-out verwijderen?";
-App::$strings["Upload photo"] = "Foto uploaden";
-App::$strings["Insert YouTube video"] = "YouTube-video invoegen";
-App::$strings["Insert Vorbis [.ogg] video"] = "Vorbis-video [.ogg] invoegen";
-App::$strings["Insert Vorbis [.ogg] audio"] = "Vorbis-audio [.ogg] invoegen";
-App::$strings["Set your location"] = "Locatie instellen";
-App::$strings["Clear browser location"] = "Locatie van webbrowser wissen";
-App::$strings["Please wait"] = "Even wachten";
-App::$strings["Layout Description (Optional)"] = "Lay-out-omschrijving (optioneel)";
 App::$strings["Layout Name"] = "Naam lay-out";
-App::$strings["Set expiration date"] = "Verloopdatum instellen";
+App::$strings["Layout Description (Optional)"] = "Lay-out-omschrijving (optioneel)";
 App::$strings["Edit Layout"] = "Lay-out bewerken";
 App::$strings["Item is not editable"] = "Item is niet te bewerken";
-App::$strings["Expires YYYY-MM-DD HH:MM"] = "Verloopt op DD-MM-YYYY om HH:MM";
-App::$strings["Delete item?"] = "Item verwijderen?";
-App::$strings["Toggle voting"] = "Peiling in- of uitschakelen";
-App::$strings["OK"] = "OK";
-App::$strings["Cancel"] = "Annuleren";
 App::$strings["Edit post"] = "Bericht bewerken";
-App::$strings["Delete webpage?"] = "Webpagina verwijderen?";
-App::$strings["Page link title"] = "Titel van paginalink";
+App::$strings["Page link"] = "Paginalink";
 App::$strings["Edit Webpage"] = "Webpagina bewerken";
 App::$strings["Calendar entries imported."] = "Agenda-items geïmporteerd.";
 App::$strings["No calendar entries found."] = "Geen agenda-items gevonden.";
@@ -575,6 +568,8 @@ App::$strings["Edit Description"] = "Omschrijving bewerken";
 App::$strings["Edit Location"] = "Locatie bewerken";
 App::$strings["Location"] = "Locatie";
 App::$strings["Share this event"] = "Deel deze gebeurtenis";
+App::$strings["Preview"] = "Voorvertoning";
+App::$strings["Permission settings"] = "Permissies";
 App::$strings["Advanced Options"] = "Geavanceerde opties";
 App::$strings["Edit event"] = "Gebeurtenis bewerken";
 App::$strings["Delete event"] = "Gebeurtenis verwijderen";
@@ -760,11 +755,14 @@ App::$strings["Selected channel has private message restrictions. Send failed."]
 App::$strings["Messages"] = "Berichten";
 App::$strings["Message recalled."] = "Bericht ingetrokken.";
 App::$strings["Conversation removed."] = "Conversatie verwijderd";
+App::$strings["Expires YYYY-MM-DD HH:MM"] = "Verloopt op DD-MM-YYYY om HH:MM";
 App::$strings["Requested channel is not in this network"] = "Opgevraagd kanaal is niet in dit netwerk beschikbaar";
 App::$strings["Send Private Message"] = "Privébericht versturen";
 App::$strings["To:"] = "Aan:";
 App::$strings["Subject:"] = "Onderwerp:";
+App::$strings["Attach file"] = "Bestand toevoegen";
 App::$strings["Send"] = "Verzenden";
+App::$strings["Set expiration date"] = "Verloopdatum instellen";
 App::$strings["Delete message"] = "Bericht verwijderen";
 App::$strings["Delivery report"] = "Afleveringsrapport";
 App::$strings["Recall message"] = "Bericht intrekken";
@@ -906,7 +904,6 @@ App::$strings["Use as profile photo"] = "Als profielfoto gebruiken";
 App::$strings["Use as cover photo"] = "Als omslagfoto gebruiken";
 App::$strings["Private Photo"] = "Privéfoto";
 App::$strings["View Full Size"] = "Volledige grootte weergeven";
-App::$strings["Remove"] = "Verwijderen";
 App::$strings["Edit photo"] = "Foto bewerken";
 App::$strings["Rotate CW (right)"] = "Draai met de klok mee (naar rechts)";
 App::$strings["Rotate CCW (left)"] = "Draai tegen de klok in (naar links)";
@@ -918,6 +915,7 @@ App::$strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Voorbeeld:
 App::$strings["Flag as adult in album view"] = "Markeer als voor volwassenen in albumweergave";
 App::$strings["I like this (toggle)"] = "Vind ik leuk";
 App::$strings["I don't like this (toggle)"] = "Vind ik niet leuk";
+App::$strings["Please wait"] = "Even wachten";
 App::$strings["This is you"] = "Dit ben jij";
 App::$strings["Comment"] = "Reactie";
 App::$strings["__ctx:title__ Likes"] = "vinden dit leuk";
@@ -1099,7 +1097,6 @@ App::$strings["Search results for: %s"] = "Zoekresultaten voor %s";
 App::$strings["No service class restrictions found."] = "Geen abonnementsbeperkingen gevonden.";
 App::$strings["Name is required"] = "Naam is vereist";
 App::$strings["Key and Secret are required"] = "Key en secret zijn vereist";
-App::$strings["Update"] = "Bijwerken";
 App::$strings["Not valid email."] = "Geen geldig e-mailadres.";
 App::$strings["Protected email address. Cannot change to that email."] = "Beschermd e-mailadres. Kan dat e-mailadres niet gebruiken.";
 App::$strings["System failure storing new email. Please try again."] = "Systeemfout opslaan van nieuwe e-mail. Probeer het nog een keer.";
@@ -1195,11 +1192,12 @@ App::$strings["0 or blank to use the website limit. The website expires after %d
 App::$strings["Maximum Friend Requests/Day:"] = "Maximum aantal connectieverzoeken per dag:";
 App::$strings["May reduce spam activity"] = "Kan eventuele spam verminderen";
 App::$strings["Default Post Permissions"] = "Standaard permissies voor nieuwe berichten";
+App::$strings["Use my default audience setting for the type of post"] = "Gebruik van mijn standaard privacy-instelling voor berichten";
 App::$strings["Channel permissions category:"] = "Kanaaltype en -permissies:";
 App::$strings["Maximum private messages per day from unknown people:"] = "Maximum aantal privé-berichten per dag van onbekende personen:";
 App::$strings["Useful to reduce spamming"] = "Kan eventuele spam verminderen";
 App::$strings["Notification Settings"] = "Notificatie-instellingen";
-App::$strings["By default post a status message when:"] = "Plaats automatisch een statusbericht wanneer:";
+App::$strings["By default post a status message when:"] = "Plaats automatisch een bericht wanneer:";
 App::$strings["accepting a friend request"] = "Een connectieverzoek wordt geaccepteerd";
 App::$strings["joining a forum/community"] = "Je lid wordt van een forum/groep";
 App::$strings["making an <em>interesting</em> profile change"] = "Er sprake is van een <em>interessante</em> profielwijziging";
@@ -1269,6 +1267,8 @@ 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"] = "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.";
 App::$strings["PHP executable path"] = "PHP executable path";
@@ -1354,6 +1354,7 @@ App::$strings["Import all or selected content from the following channel into th
 App::$strings["Only import content with these words (one per line)"] = "Importeer alleen inhoud met deze woorden (één per regel)";
 App::$strings["Leave blank to import all public content"] = "Laat leeg om alle openbare inhoud te importeren";
 App::$strings["Channel Name"] = "Kanaalnaam";
+App::$strings["Add the following categories to posts imported from this source (comma separated)"] = "De volgende categorieën aan berichten toevoegen die uit deze bron zijn geïmporteerd (door komma's gescheiden)";
 App::$strings["Source not found."] = "Bron niet gevonden";
 App::$strings["Edit Source"] = "Bron bewerken";
 App::$strings["Delete Source"] = "Bron verwijderen";
@@ -1452,64 +1453,15 @@ App::$strings["School/education:"] = "School/opleiding:";
 App::$strings["Like this thing"] = "Vind dit ding leuk";
 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["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["Image"] = "Afbeelding";
-App::$strings["Insert Link"] = "Link invoegen";
-App::$strings["Video"] = "Video";
-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["Administrator"] = "Beheerder";
-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["Embedded content"] = "Ingesloten (embedded) inhoud";
+App::$strings["Embedding disabled"] = "Insluiten (embedding) uitgeschakeld";
+App::$strings["Visible to your default audience"] = "Voor iedereen zichtbaar, mits niet anders ingesteld";
+App::$strings["Limit access:"] = "Toegang beperken:";
+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["Currently Male"] = "Momenteel man";
 App::$strings["Currently Female"] = "Momenteel vrouw";
 App::$strings["Mostly Male"] = "Voornamelijk man";
@@ -1565,239 +1517,11 @@ 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["Visible to your default audience"] = "Voor iedereen zichtbaar, mits niet anders ingesteld";
-App::$strings["Show"] = "Tonen";
-App::$strings["Don't show"] = "Niet tonen";
-App::$strings["Other networks and post services"] = "Andere netwerken en diensten";
 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["prev"] = "vorige";
-App::$strings["first"] = "eerste";
-App::$strings["last"] = "laatste";
-App::$strings["next"] = "volgende";
-App::$strings["older"] = "ouder";
-App::$strings["newer"] = "nieuwer";
-App::$strings["No connections"] = "Geen connecties";
-App::$strings["View all %s connections"] = "Toon alle %s connecties";
-App::$strings["poke"] = "aanstoten";
-App::$strings["poked"] = "aangestoten";
-App::$strings["ping"] = "ping";
-App::$strings["pinged"] = "gepingd";
-App::$strings["prod"] = "por";
-App::$strings["prodded"] = "gepord";
-App::$strings["slap"] = "slaan";
-App::$strings["slapped"] = "sloeg";
-App::$strings["finger"] = "finger";
-App::$strings["fingered"] = "gefingerd";
-App::$strings["rebuff"] = "afpoeieren";
-App::$strings["rebuffed"] = "afgepoeierd";
-App::$strings["happy"] = "gelukkig";
-App::$strings["sad"] = "bedroefd";
-App::$strings["mellow"] = "mellow";
-App::$strings["tired"] = "moe";
-App::$strings["perky"] = "parmantig";
-App::$strings["angry"] = "boos";
-App::$strings["stupefied"] = "verbijsterd";
-App::$strings["puzzled"] = "verward";
-App::$strings["interested"] = "geïnteresseerd";
-App::$strings["bitter"] = "verbitterd";
-App::$strings["cheerful"] = "vrolijk";
-App::$strings["alive"] = "levendig";
-App::$strings["annoyed"] = "geërgerd";
-App::$strings["anxious"] = "bezorgd";
-App::$strings["cranky"] = "humeurig";
-App::$strings["disturbed"] = "verontrust";
-App::$strings["frustrated"] = "gefrustreerd ";
-App::$strings["depressed"] = "gedeprimeerd";
-App::$strings["motivated"] = "gemotiveerd";
-App::$strings["relaxed"] = "ontspannen";
-App::$strings["surprised"] = "verrast";
-App::$strings["Monday"] = "maandag";
-App::$strings["Tuesday"] = "dinsdag";
-App::$strings["Wednesday"] = "woensdag";
-App::$strings["Thursday"] = "donderdag";
-App::$strings["Friday"] = "vrijdag";
-App::$strings["Saturday"] = "zaterdag";
-App::$strings["Sunday"] = "zondag";
-App::$strings["January"] = "januari";
-App::$strings["February"] = "februari";
-App::$strings["March"] = "maart";
-App::$strings["April"] = "april";
-App::$strings["May"] = "mei";
-App::$strings["June"] = "juni";
-App::$strings["July"] = "juli";
-App::$strings["August"] = "augustus";
-App::$strings["September"] = "september";
-App::$strings["October"] = "oktober";
-App::$strings["November"] = "november";
-App::$strings["December"] = "december";
-App::$strings["Unknown Attachment"] = "Onbekende bijlage";
-App::$strings["unknown"] = "onbekend";
-App::$strings["remove category"] = "categorie verwijderen";
-App::$strings["remove from file"] = "uit map verwijderen";
-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["default"] = "standaard";
-App::$strings["Page layout"] = "Pagina-lay-out";
-App::$strings["You can create your own with the layouts tool"] = "Je kan jouw eigen lay-out ontwerpen onder lay-outs";
-App::$strings["Page content type"] = "Opmaaktype pagina";
-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["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["Site Admin"] = "Hubbeheerder";
-App::$strings["Bookmarks"] = "Bladwijzers";
-App::$strings["Address Book"] = "Connecties";
-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["Install"] = "Installeren";
-App::$strings["Purchase"] = "Aanschaffen";
-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["Attachments:"] = "Bijlagen:";
-App::$strings["\$Projectname event notification:"] = "Notificatie \$Projectname-gebeurtenis:";
-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["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["Visible to <strong>everybody</strong>"] = "Voor <strong>iedereen</strong> zichtbaar";
-App::$strings["Please enter a video link/URL:"] = "Vul een videolink/URL in:";
-App::$strings["Please enter an audio link/URL:"] = "Vul een audiolink/URL in:";
-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["upload photo"] = "foto uploaden";
-App::$strings["attach file"] = "bestand toevoegen";
-App::$strings["web link"] = "Weblink";
-App::$strings["Insert video link"] = "Videolink invoegen";
-App::$strings["video link"] = "videolink";
-App::$strings["Insert audio link"] = "Audiolink invoegen";
-App::$strings["audio link"] = "audiolink";
-App::$strings["set location"] = "locatie instellen";
-App::$strings["clear location"] = "locatie wissen";
-App::$strings["permissions"] = "permissies";
-App::$strings["Set publish date"] = "Publicatiedatum instellen";
-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["Photo Albums"] = "Fotoalbums";
-App::$strings["Files and Storage"] = "Bestanden en opslagruimte";
-App::$strings["Chatrooms"] = "Chatkanalen";
-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["%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["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["Logged out."] = "Uitgelogd.";
-App::$strings["Failed authentication"] = "Mislukte authenticatie";
-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["Public Timeline"] = "Openbare tijdlijn";
-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["%d invitation available"] = array(
 	0 => "%d uitnodiging beschikbaar",
 	1 => "%d uitnodigingen beschikbaar",
@@ -1817,6 +1541,189 @@ App::$strings["%d connection in common"] = array(
 	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["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["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["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["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["%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["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["Logged out."] = "Uitgelogd.";
+App::$strings["Failed authentication"] = "Mislukte authenticatie";
+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["(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["Logout"] = "Uitloggen";
+App::$strings["End this session"] = "Beëindig deze sessie";
+App::$strings["Home"] = "Home";
+App::$strings["Your posts and conversations"] = "Jouw kanaal";
+App::$strings["Your profile page"] = "Jouw profielpagina";
+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";
+App::$strings["Click to authenticate to your home hub"] = "Authenticeer jezelf via (bijvoorbeeld) jouw hub";
+App::$strings["Home Page"] = "Homepage";
+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["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["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["view full size"] = "volledige grootte tonen";
+App::$strings["\$Projectname Notification"] = "\$Projectname-notificatie";
+App::$strings["\$projectname"] = "\$projectname";
+App::$strings["Thank You,"] = "Bedankt,";
+App::$strings["%s Administrator"] = "Beheerder %s";
+App::$strings["Administrator"] = "Beheerder";
+App::$strings["No Subject"] = "Geen onderwerp";
+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["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";
@@ -1872,10 +1779,6 @@ 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.";
@@ -1912,12 +1815,51 @@ 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["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["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["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";
@@ -1962,7 +1904,6 @@ App::$strings["Search by Date"] = "Zoek op datum";
 App::$strings["Ability to select posts by date ranges"] = "Mogelijkheid om berichten op datum te filteren ";
 App::$strings["Privacy Groups"] = "Privacygroepen";
 App::$strings["Enable management and selection of privacy groups"] = "Beheer en selectie van privacygroepen inschakelen";
-App::$strings["Saved Searches"] = "Opgeslagen zoekopdrachten";
 App::$strings["Save search terms for re-use"] = "Sla zoekopdrachten op voor hergebruik";
 App::$strings["Network Personal Tab"] = "Persoonlijke netwerktab";
 App::$strings["Enable tab to display only Network posts that you've interacted on"] = "Sta het toe dat de tab netwerkberichten toont waarmee je interactie had";
@@ -1999,7 +1940,6 @@ 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["add"] = "toevoegen";
 App::$strings["Image/photo"] = "Afbeelding/foto";
 App::$strings["Encrypted content"] = "Versleutelde inhoud";
 App::$strings["Install %s element: "] = "Installeer %s-element: ";
@@ -2009,82 +1949,178 @@ 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["(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["view full size"] = "volledige grootte tonen";
-App::$strings["No Subject"] = "Geen onderwerp";
-App::$strings["System"] = "Systeem";
-App::$strings["Create Personal App"] = "Persoonlijke app maken";
-App::$strings["Edit Personal App"] = "Persoonlijke app bewerken";
-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["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["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["Admin"] = "Beheer";
-App::$strings["Plugin Features"] = "Plugin-opties";
+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";
+App::$strings["next"] = "volgende";
+App::$strings["older"] = "ouder";
+App::$strings["newer"] = "nieuwer";
+App::$strings["No connections"] = "Geen connecties";
+App::$strings["View all %s connections"] = "Toon alle %s connecties";
+App::$strings["poke"] = "aanstoten";
+App::$strings["ping"] = "ping";
+App::$strings["pinged"] = "gepingd";
+App::$strings["prod"] = "por";
+App::$strings["prodded"] = "gepord";
+App::$strings["slap"] = "slaan";
+App::$strings["slapped"] = "sloeg";
+App::$strings["finger"] = "finger";
+App::$strings["fingered"] = "gefingerd";
+App::$strings["rebuff"] = "afpoeieren";
+App::$strings["rebuffed"] = "afgepoeierd";
+App::$strings["happy"] = "gelukkig";
+App::$strings["sad"] = "bedroefd";
+App::$strings["mellow"] = "mellow";
+App::$strings["tired"] = "moe";
+App::$strings["perky"] = "parmantig";
+App::$strings["angry"] = "boos";
+App::$strings["stupefied"] = "verbijsterd";
+App::$strings["puzzled"] = "verward";
+App::$strings["interested"] = "geïnteresseerd";
+App::$strings["bitter"] = "verbitterd";
+App::$strings["cheerful"] = "vrolijk";
+App::$strings["alive"] = "levendig";
+App::$strings["annoyed"] = "geërgerd";
+App::$strings["anxious"] = "bezorgd";
+App::$strings["cranky"] = "humeurig";
+App::$strings["disturbed"] = "verontrust";
+App::$strings["frustrated"] = "gefrustreerd ";
+App::$strings["depressed"] = "gedeprimeerd";
+App::$strings["motivated"] = "gemotiveerd";
+App::$strings["relaxed"] = "ontspannen";
+App::$strings["surprised"] = "verrast";
+App::$strings["Monday"] = "maandag";
+App::$strings["Tuesday"] = "dinsdag";
+App::$strings["Wednesday"] = "woensdag";
+App::$strings["Thursday"] = "donderdag";
+App::$strings["Friday"] = "vrijdag";
+App::$strings["Saturday"] = "zaterdag";
+App::$strings["Sunday"] = "zondag";
+App::$strings["January"] = "januari";
+App::$strings["February"] = "februari";
+App::$strings["March"] = "maart";
+App::$strings["April"] = "april";
+App::$strings["May"] = "mei";
+App::$strings["June"] = "juni";
+App::$strings["July"] = "juli";
+App::$strings["August"] = "augustus";
+App::$strings["September"] = "september";
+App::$strings["October"] = "oktober";
+App::$strings["November"] = "november";
+App::$strings["December"] = "december";
+App::$strings["Unknown Attachment"] = "Onbekende bijlage";
+App::$strings["unknown"] = "onbekend";
+App::$strings["remove category"] = "categorie verwijderen";
+App::$strings["remove from file"] = "uit map verwijderen";
+App::$strings["default"] = "standaard";
+App::$strings["Page layout"] = "Pagina-lay-out";
+App::$strings["You can create your own with the layouts tool"] = "Je kan jouw eigen lay-out ontwerpen onder lay-outs";
+App::$strings["Page content type"] = "Opmaaktype pagina";
+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["Tags"] = "Tags";
 App::$strings["Keywords"] = "Trefwoorden";
 App::$strings["have"] = "heb";
@@ -2093,12 +2129,26 @@ App::$strings["want"] = "wil";
 App::$strings["wants"] = "wil";
 App::$strings["likes"] = "vindt dit leuk";
 App::$strings["dislikes"] = "vindt dit niet leuk";
+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 me (only specified contacts and me)"] = "Alleen ik en specifieke connecties";
+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";
 App::$strings["[-] collapse"] = "[-] inklappen";
 App::$strings["Password too short"] = "Wachtwoord te kort";
 App::$strings["Passwords do not match"] = "Wachtwoorden komen niet overeen";
+App::$strings["everybody"] = "iedereen";
 App::$strings["Secret Passphrase"] = "Geheim wachtwoord";
 App::$strings["Passphrase hint"] = "Wachtwoordhint";
 App::$strings["Notice: Permissions have changed but have not yet been submitted."] = "Mededeling: de permissies zijn veranderd, maar zijn nog niet opgeslagen.";
@@ -2154,48 +2204,7 @@ 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["Logout"] = "Uitloggen";
-App::$strings["End this session"] = "Beëindig deze sessie";
-App::$strings["Home"] = "Home";
-App::$strings["Your posts and conversations"] = "Jouw kanaal";
-App::$strings["Your profile page"] = "Jouw profielpagina";
-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["Your chatrooms"] = "Jouw chatkanalen";
-App::$strings["Your bookmarks"] = "Jouw bladwijzers";
-App::$strings["Your webpages"] = "Jouw webpagina's";
-App::$strings["Sign in"] = "Inloggen";
-App::$strings["%s - click to logout"] = "%s - klik om uit te loggen";
-App::$strings["Remote authentication"] = "Authenticatie op afstand";
-App::$strings["Click to authenticate to your home hub"] = "Authenticeer jezelf via (bijvoorbeeld) jouw hub";
-App::$strings["Home Page"] = "Homepage";
-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["Channel Directory"] = "Kanalengids";
-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["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["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["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["Site Setup and Configuration"] = "Hub instellen en beheren";
-App::$strings["@name, #tag, ?doc, content"] = "@kanaal, #tag, inhoud, ?hulp";
-App::$strings["Please wait..."] = "Wachten aub...";
-App::$strings["Embedded content"] = "Ingesloten (embedded) inhoud";
-App::$strings["Embedding disabled"] = "Insluiten (embedding) uitgeschakeld";
+App::$strings["Public Timeline"] = "Openbare tijdlijn";
 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";
@@ -2233,12 +2242,20 @@ 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["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["Upload New Photos"] = "Nieuwe foto's uploaden";
+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["Focus (Hubzilla default)"] = "Focus (Hubzilla-standaard)";
 App::$strings["Theme settings"] = "Thema-instellingen";
 App::$strings["Select scheme"] = "Kies schema van thema";
diff --git a/view/theme/redbasic/schema/bluegrid.css b/view/theme/redbasic/schema/bluegrid.css
index 591e820a1..64e5a2c95 100644
--- a/view/theme/redbasic/schema/bluegrid.css
+++ b/view/theme/redbasic/schema/bluegrid.css
@@ -333,6 +333,15 @@ input {
 	text-decoration: none;
 }
 
+.section-content-info-wrapper {
+	color: #fff;
+	background-color: #43488A;
+}
+
+.section-content-info-wrapper a {
+	color: #fff;
+}
+
 .btn, #event-edit-form .btn, input.directory-rating-submit {
     border: 1px solid #FFF;
     color: #FFF; 
@@ -450,7 +459,7 @@ a:hover > .fa-trash-o {
 	.navbar-inverse .navbar-toggle .icon-bar {
 		background-color: #FFF;
 	}
-	.navbar-inverse .navbar-toggle .fa-arrow-circle-down, .navbar-inverse .navbar-toggle .fa-arrow-circle-right, .navbar-inverse .navbar-toggle .fa-arrow-circle-up, .navbar-inverse .navbar-toggle .fa-arrow-circle-left  {
+	.navbar-inverse .navbar-toggle .fa-arrow-circle-down, .navbar-inverse .navbar-toggle .fa-arrow-circle-right, .navbar-inverse .navbar-toggle .fa-arrow-circle-up, .navbar-inverse .navbar-toggle .fa-arrow-circle-left, .navbar-inverse .navbar-toggle .fa-question-circle  {
 		color: #FFF;
 	}
 	.navbar-inverse .navbar-toggle:hover .fa-arrow-circle-down, .navbar-inverse .navbar-toggle:focus .fa-arrow-circle-down, .navbar-inverse .navbar-toggle:hover .fa-arrow-circle-right, .navbar-inverse .navbar-toggle:focus .fa-arrow-circle-right, .navbar-inverse .navbar-toggle:hover .fa-arrow-circle-up, .navbar-inverse .navbar-toggle:focus .fa-arrow-circle-up, .navbar-inverse .navbar-toggle:hover .fa-arrow-circle-left, .navbar-inverse .navbar-toggle:focus .fa-arrow-circle-left {
diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css
index fb18a4159..ea50f50ec 100644
--- a/view/theme/redbasic/schema/dark.css
+++ b/view/theme/redbasic/schema/dark.css
@@ -63,7 +63,7 @@
 	background-image: linear-gradient(to bottom, #1E1E1E 0px, #1E1E1E 100%);
 }
 
-.alert-info {
+.alert-info, .section-content-info-wrapper {
 	color: #CCC;
 	background-color:#333;
 	border-color: #444;
@@ -79,16 +79,35 @@
 	color: #fff;
 }
 
-#acl-showall {
-	color: #fff;
+#acl-select {
+	background-color:#333;
+	border: 1px solid #444;
+	color: #FFF;
 }
 
+#acl-showall {
+	color: #FFF;
+}
+
+
 #acl-list {
-	border: 1px solid #333;
+	border: 1px solid #444;
+}
+
+#acl-search-wrapper {
+	border-bottom: 1px solid #444;
 }
 
 .acl-list-item {
-	border: 1px solid #333;
+	border: 1px solid #222;
+	color: #CCC;
+	background-color:#333;
+}
+
+.abook-self {
+	border: 1px solid #222;
+	color: #555;
+	background-color:#111;	
 }
 
 .modal-content {
@@ -312,7 +331,7 @@ pre {
 	background-image: none;
 }
 
-.open .dropdown-toggle.btn-default {
+.open .dropdown-toggle.btn-default, .open .dropdown-toggle.btn-default:focus {
     color: #ccc; 
     background-color: #222; 
     border-color: #222; 
diff --git a/view/theme/redbasic/schema/simple_black_on_white.css b/view/theme/redbasic/schema/simple_black_on_white.css
index e5cfb5f46..b7cca0930 100644
--- a/view/theme/redbasic/schema/simple_black_on_white.css
+++ b/view/theme/redbasic/schema/simple_black_on_white.css
@@ -51,8 +51,21 @@
 	background-image: linear-gradient(to bottom, #fff 0px, #fff 100%);
 }
 
+#acl-select {
+       border: 1px solid #000;
+       color: #000;
+}
+
+.acl-list-item {
+	border: 1px solid #000;
+	background-color: #FFF;
+
+}
+
 .abook-self {
-	background-color: #fff;
+	border: 1px solid #EEE;
+	color: #ccc;
+	background-color: #EEE;
 }
 
 .acl-button-show,
@@ -60,18 +73,10 @@
 	color: #000;
 }
 
-#acl-showall {
-	color: #000;
-}
-
 #acl-list {
 	border: 1px solid #fff;
 }
 
-.acl-list-item {
-	border: 1px solid #fff;
-}
-
 .modal-content {
     background-color: #fff;
 }
diff --git a/view/theme/redbasic/schema/simple_green_on_black.css b/view/theme/redbasic/schema/simple_green_on_black.css
index 7e3f901ef..990980e8f 100644
--- a/view/theme/redbasic/schema/simple_green_on_black.css
+++ b/view/theme/redbasic/schema/simple_green_on_black.css
@@ -51,8 +51,30 @@
 	background-image: linear-gradient(to bottom, #000 0px, #000 100%);
 }
 
+.section-content-info-wrapper {
+	color: #50f148;
+	background-color:#000;
+	border: 1px solid #143D12 !important;
+}
+
+.modal-header {
+	border-bottom: 1px solid #143D12;
+}
+
+.modal-footer {
+	border-top: 1px solid #143D12;
+}
+
+#acl-select {
+       background-color: #000;
+       border: 1px solid #143D12;
+       color: #50f148;
+}
+
 .abook-self {
-	background-color: #000;
+	color: #333;
+	background-color: #000 !important;
+	border: 1px solid #111;
 }
 
 .acl-button-show,
@@ -60,16 +82,18 @@
 	color: #fff;
 }
 
-#acl-showall {
-	color: #fff;
+#acl-list {
+       border: 1px solid #143D12;
 }
 
-#acl-list {
-	border: 1px solid #000;
+#acl-search-wrapper {
+       border-bottom: 1px solid #143D12;
 }
 
 .acl-list-item {
-	border: 1px solid #000;
+	border: 1px solid #111;
+	background-color:#111;
+
 }
 
 .modal-content {
@@ -267,7 +291,7 @@ pre {
 	background-image: none;
 }
 
-.open .dropdown-toggle.btn-default {
+.open .dropdown-toggle.btn-default, .open .dropdown-toggle.btn-default:focus {
     color: #50f148; 
     background-color: #000; 
     border-color: #143D12; 
diff --git a/view/theme/redbasic/schema/simple_white_on_black.css b/view/theme/redbasic/schema/simple_white_on_black.css
index d86154297..c23dbaf68 100644
--- a/view/theme/redbasic/schema/simple_white_on_black.css
+++ b/view/theme/redbasic/schema/simple_white_on_black.css
@@ -47,8 +47,30 @@
 	background-image: linear-gradient(to bottom, #000 0px, #000 100%);
 }
 
+.section-content-info-wrapper {
+	color: #fff;
+	background-color:#000;
+	border: 1px solid #fff !important;
+}
+
+.modal-header {
+	border-bottom: 1px solid #000;
+}
+
+.modal-footer {
+	border-top: 1px solid #000;
+}
+
+#acl-select {
+       background-color: #000;
+       border: 1px solid #fff;
+       color: #fff;
+}
+
 .abook-self {
-	background-color: #000;
+	color: #333;
+	background-color: #111 !important;
+	border: 1px solid #111;
 }
 
 .acl-button-show,
@@ -56,16 +78,17 @@
 	color: #fff;
 }
 
-#acl-showall {
-	color: #fff;
+#acl-list {
+       border: 1px solid #000;
 }
 
-#acl-list {
-	border: 1px solid #000;
+#acl-search-wrapper {
+       border-bottom: 1px solid #000;
 }
 
 .acl-list-item {
-	border: 1px solid #000;
+	border: 1px solid #fff;
+	background-color:#000;
 }
 
 .modal-content {
@@ -246,10 +269,10 @@ pre {
 	background-image: none;
 }
 
-.open .dropdown-toggle.btn-default {
+.open .dropdown-toggle.btn-default, .open .dropdown-toggle.btn-default:focus {
     color: #fff; 
     background-color: #000; 
-    border-color: #000; 
+    border-color: #fff; 
 }
 
 .preview {
diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl
index 0e9562157..b30669f9a 100755
--- a/view/tpl/acl_selector.tpl
+++ b/view/tpl/acl_selector.tpl
@@ -12,6 +12,18 @@
 				{{if $aclModalDesc}}
 				<div id="acl-dialog-description" class="section-content-info-wrapper">{{$aclModalDesc}}</div>
 				{{/if}}
+				<label for="acl-select">{{$select_label}}</label>
+				<select id="acl-select" name="optionsRadios" class="form-control form-group">
+					<option id="acl-showall" value="option1" selected>{{$showall}}</option>
+					<option id="acl-showlimited" value="option2">{{$showlimited}}</option>
+				</select>
+
+				{{if $showallOrigin}}
+				<div id="acl-info" class="form-group">
+					<i class="fa fa-info-circle"></i>&nbsp;{{$showallOrigin}}
+				</div>
+				{{/if}}
+
 				{{if $jotnets}}
 				<div class="jotnets-wrapper" role="tab" id="jotnets-wrapper">
 					<a data-toggle="collapse" class="btn btn-block btn-default" href="#jotnets-collapse" aria-expanded="false" aria-controls="jotnets-collapse">{{$jnetModalTitle}} <span class="caret"></span></a>
@@ -21,25 +33,8 @@
 					<div class="clear"></div>
 				</div>
 				{{/if}}
+
 				<div id="acl-wrapper">
-					<div id="acl-radiowrapper-showall" class="radio">
-						<label>
-							<input id="acl-showall" type="radio" name="optionsRadios" value="option1" checked>
-							{{if $showallIcon}}
-							<i class="fa {{$showallIcon}}"></i>
-							{{/if}}
-							<span id="acl-showall-caption">{{$showall}}</span>
-						</label>
-						{{if $showallOrigin}}
-						&nbsp;<a id="acl-info-icon" role="button" tabindex="0" class="fa fa-info-circle" data-trigger="focus" data-toggle="popover" data-placement="top" data-content="{{$showallOrigin}}"></a>
-						{{/if}}
-					</div>
-					<div id="acl-radiowrapper-showlimited" class="radio">
-						<label>
-							<input id="acl-showlimited" type="radio" name="optionsRadios" style="readonly" value="option2">
-							<span id=acl-showlimited-caption>{{$showlimited}}</span>
-						</label>
-					</div>
 					<div id="acl-list">
 						<div id="acl-search-wrapper">
 							<input type="text" id="acl-search" placeholder="&#xf002; {{$search}}">
diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl
index e92265b5d..341ff7649 100644
--- a/view/tpl/chat.tpl
+++ b/view/tpl/chat.tpl
@@ -33,6 +33,9 @@
 							<li class="nav-item"><a class="nav-link" href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=online"><i class="fa fa-circle online"></i>&nbsp;{{$online}}</a></li>
 							<li class="nav-item"><a class="nav-link" href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=away"><i class="fa fa-circle away"></i>&nbsp;{{$away}}</a></li>
 							<li class="nav-item"><a class="nav-link" href="{{$baseurl}}/chat/{{$nickname}}/{{$room_id}}/leave"><i class="fa fa-circle leave"></i>&nbsp;{{$leave}}</a></li>
+                            <li class="divider"></li>
+                            <li class="nav-item" id="toggle-notifications"><a class="nav-link" href="" onclick="toggleChatNotifications(); return false;"><i id="toggle-notifications-icon" class="fa fa-bell-slash-o"></i>&nbsp;Toggle notifications</a></li>
+                            <li class="nav-item disabled" id="toggle-notifications-audio"><a class="nav-link" href="" onclick="toggleChatNotificationAudio(); return false;"><i id="toggle-notifications-audio-icon" class="fa fa-volume-off"></i>&nbsp;Toggle sound</a></li>
 							{{if $bookmark_link}}
 							<li class="divider"></li>
 							<li class="nav-item"><a class="nav-link" href="{{$bookmark_link}}" target="_blank" ><i class="fa fa-bookmark"></i>&nbsp;{{$bookmark}}</a></li>
@@ -194,6 +197,7 @@ function update_chats(chats) {
 		else {
 			newNode.setAttribute('class', 'chat-item clear');
 			$(newNode).html('<img class="chat-item-photo" src="' + item.img + '" alt="' + item.name + '" /><div class="chat-body"><div class="chat-item-title wall-item-ago"><span class="chat-item-name">' + item.name + ' </span><span class="autotime chat-item-time" title="' + item.isotime + '">' + item.localtime + '</span></div><div class="chat-item-text">' + item.text + '</div></div>');
+            chat_issue_notification(item.name + ':\n' + item.text, 'Hubzilla Chat');
 		}
 		$('#chatLineHolder').append(newNode);
 		$(".autotime").timeago();
@@ -204,6 +208,9 @@ function update_chats(chats) {
 }
 
 var chat_notify_granted = false; // Initialize notification permission to denied
+var chat_notify_enabled = false;
+var chat_notify_audio_enabled = false;
+var chat_notify_audio = {};
 // Request notification access from the user
 // TODO: Check Hubzilla member config setting before requesting permission
 function chatNotificationInit() {
@@ -226,12 +233,17 @@ function chatNotificationInit() {
             }
         });
     }
+    // Encode a wav audio file in base64 and create the audio object for game alerts
+    //var base64string = 'UklGRr4VAABXQVZFZm10IBAAAAABAAEAIlYAACJWAAABAAgAZGF0YZkVAACAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIBxcnJycoGNjY2NjYyMjIyMg3FxcXFxcXJycnJ0jY2NjY2NjIyMjIx1cXFxcXFxcnJycoKNjY2NjY2MjIyMgXFxcXFxcXJycnJ2jY2NjY2NjIyMjIxzcXFxcXFxcnJycoSNjY2NjY2MjIyMgHFxcXFxcXJycnJ4jY2NjY2NjIyMjIxycXFxcXFycnJycoWNjY2NjY2MjIyMf3FxcXFxcXJycnJ5jY2NjY2NjIyMjIxxcXFxcXFycnJycoeNjY2NjY2MjIyMfnFxcXFxcXJycnJ7jY2NjY2NjIyMjIpxcXFxcXFycnJycomNjY2NjYyMjIyMfHFxcXFxcXJycnJ8jY2NjY2NjIyMjIhycnJycoyLi4uLi4uLioqKfHFxcXFxcnJycnJyc4yMjIuLi4uLi4uKin5xcXFxcnJycnJyc3OMjIyMi4uLi4uLi4p/cXFxcnJycnJyc3Nzi4yMjIyLi4uLi4uLgHBwcXFxcXFxcnJycouNjY2NjYyMjIyMjIBwcHFxcXFxcXJycnKLjY2NjY2MjIyMjIyBcHFxcXFxcXJycnJyio2NjY2NjIyMjIyMgnBxcXFxcXFycnJycomNjY2NjY2MjIyMjINwcXFxcXFxcnJycnKIjY2NjY2NjIyMjIyEcHFxcXFxcXJycnJyh42NjY2NjYyMjIyMhXBxcXFxcXFycnJycoaNjY2NjY2MjIyMjIZwcXFxcXFxcnJycnKFjY2NjY2NjIyMjIyHcHFxcXFxcXJycnJyhI2NjY2NjYyMjIyMiHBxcXFxcXFycnJycoONjY2NjY2MjIyMjIlwcXFxcXFxcnJycnKCjY2NjY2NjIyMjIyKcHFxcXFxcXJycnJygY2NjYyMjIyLi4uLi4uLioqKioqKdnBxcXFxcXFycnKAi4uLi4uLioqKioJxcXFxcXFycnJydIyMi4uLi4uLi4qKdXFxcXFycnJycnKBjIyLi4uLi4uLioFxcXFycnJycXFydY2NjYyMjIyMjIyLc3BwcXFxcXFxcnKDjY2NjIyMjIyMjIBwcHFxcXFxcXJyd42NjY2MjIyMjIyMcnBxcXFxcXFycnKFjY2NjYyMjIyMjH9wcXFxcXFxcnJyeY2NjY2NjIyMjIyMcHFxcXFxcXJycnKHjY2NjY2MjIyMjH5xcXFxcXFycnJyeo2NjY2NjIyMjIyKcHFxcXFxcXJycnKIjY2NjY2MjIyMjHxxcXFxcXFycnJyfI2NjY2NjYyMjIyJcXFxcXFxcXJycnKKjY2NjY2MjIyMjHtxcXFxcXFycnJyfo2NjY2NjYyMjIyHcXFxcXFxcnJycnKMjY2NjY2MjIuLi3lycnJycnJzc3Nzf4yMjIyMjIuLi4uFcnJycnJycnNzc3OMjIyMjIyMi4uLi3hycnJycnJzc3NzgIyMjIyMjIuLi4uDcnJycnJycnNzc3SMjIyMjIyMi4uLi3dycnJycnJzc3NzgYyMjIyMjIuLi4uCcnJycnJyc3Nzc3aMjIyMjIyMi4uLi3VycnJycnJzc3Nzg4yMjIyMjIuLi4uAcnJycnJyc3Nzc3eMjIyMjIyMi4uLi3RycnJycnJzc3NzhIyMjIyMjIuLi4uAcnJycnJyc3Nzc3mMjIyMjIyMi4uLi3JycnJycnJzc3NzhoyMjIyMjIuLi4t+cnJycnJyc3Nzc3qMjIyMjIyLi4uLinJycnNzc3N0dHR0h4uLi4uLi4qKiop9c3Nzc3Nzc3R0dHyLi4uLi4uLioqKiHNzc3Nzc3N0dHR0iIuLi4uLi4qKiop8c3Nzc3Nzc3R0dH2Li4uLi4uLioqKhnNzc3Nzc3N0dHR0iYuLi4uLi4qKiop6c3Nzc3Nzc3R0dH+Li4uLi4uLioqKhXNzc3Nzc3N0dHR0i4uLi4uLi4qKiop5c3Nzc3Nzc3R0dICLi4uLi4uLioqKhHNzc3Nzc3N0dHR1i4uLi4uLi4qKiop4c3Nzc3NzdHR0dIGLi4uLi4uLioqKgnNzc3Nzc3N0dHR2i4uLi4uLi4qKiop2c3Nzc3NzdHR0dIKLi4uLi4uLioqKgXNzc3Nzc3N0dHR3i4uLi4uLi4qKiol2dHR0dHR0dHV1dYOKioqKioqKiYmJgHR0dHR0dHR0dXV5ioqKioqKiomJiYl0dHR0dHR0dHV1dYSKioqKioqKiYmJf3R0dHR0dHR0dXV7ioqKioqKiomJiYl0dHR0dHR0dHV1dYaKioqKioqKiYmJfnR0dHR0dHR1dXV8ioqKioqKioqJiYd0dHR0dHR0dHV1dYeKioqKioqKiYmJfHR0dHR0dHR1dXV9ioqKioqKiomJiYZ0dHR0dHR0dHV1dYiKioqKioqKiYmJe3R0dHR0dHR1dXV+ioqKioqKiomJiYV0dHR0dHR0dHV1dYmKioqKioqKiYmJenR0dHR0dHR1dXWAioqKiYmJiYmIiIN1dXV1dXV1dXZ2domJiYmJiYmJiYiIeXV1dXV1dXV1dnaAiYmJiYmJiYmIiIJ1dXV1dXV1dXZ2d4mJiYmJiYmJiYiIeHV1dXV1dXV1dnaBiYmJiYmJiYmIiIF1dXV1dXV1dXZ2eImJiYmJiYmJiYiId3V1dXV1dXV1dnaCiYmJiYmJiYmIiIB1dXV1dXV1dXZ2eYmJiYmJiYmJiIiIdnV1dXV1dXV1dnaDiYmJiYmJiYmIiH91dXV1dXV1dXZ2e4mJiYmJiYmJiIiIdXV1dXV1dXV1dnaFiYmJiYmJiYmIiH51dXV1dXV1dXZ2fImJiYmJiYmJiIiHdXV1dXV1dXV1dnaGiYmJiYmJiYmIiH11dXV1dXV1dXZ2fYiIiIiIiIiIiIiFdnZ2dnZ2dnZ2d3eGiIiIiIiIiIiIh3x2dnZ2dnZ2dnd3foiIiIiIiIiIiIeEdnZ2dnZ2dnZ2d3eHiIiIiIiIiIiIh3t2dnZ2dnZ2dnZ3f4iIiIiIiIiIiIeDdnZ2dnZ2dnZ2d3eIiIiIiIiIiIiIh3p2dnZ2dnZ2dnZ3gIiIiIiIiIiIiIeCdnZ2dnZ2dnZ2d3iIiIiIiIiIiIiIh3l2dnZ2dnZ2dnZ3gIiIiIiIiIiIiIeBdnZ2dnZ2dnZ2d3mIiIiIiIiIiIiHh3h2dnZ2dnZ2dnZ3goiIiIiIiIiIiIeAdnZ2dnZ2dnZ2d3qIiIiIiIiIiIiHh3d2dnZ2dnZ2dnZ3g4iIiIiIh4eHh4eAd3d3d3d3d3d3d3uHh4eHh4eHh4eHhnd3d3d3d3d3d3d3g4eHh4eHh4eHh4d/d3d3d3d3d3d3d3yHh4eHh4eHh4eHhnd3d3d3d3d3d3d4hIeHh4eHh4eHh4d+d3d3d3d3d3d3d32Hh4eHh4eHh4eHhXd3d3d3d3d3d3d4hYeHh4eHh4eHh4d9d3d3d3d3d3d3d36Hh4eHh4eHh4eHhHd3d3d3d3d3d3d4hoeHh4eHh4eHh4d8d3d3d3d3d3d3d3+Hh4eHh4eHh4eHg3d3d3d3d3d3d3d4h4eHh4eHh4eHh4d7d3d3d3d3d3d3d4CHh4eHh4eHh4eHgnd3d3d3d3d3d3d5h4aGhoaGhoaGhoZ7eHh4eHh4eHh4eICGhoaGhoaGhoaGgXh4eHh4eHh4eHh6h4aGhoaGhoaGhoZ6eHh4eHh4eHh4eIGGhoaGhoaGhoaGgHh4eHh4eHh4eHh7hoaGhoaGhoaGhoZ5eHh4eHh4eHh4eIKGhoaGhoaGhoaGgHh4eHh4eHh4eHh7hoaGhoaGhoaGhoZ4eHh4eHh4eHh4eIKGhoaGhoaGhoaGf3h4eHh4eHh4eHh8hoaGhoaGhoaGhoV4eHh4eHh4eHh4eIOGhoaGhoaGhoaGfnh4eHh4eHh4eHh9hoaGhoaGhoaGhoR4eHh4eHh4eHh4eISGhoaGhoaGhoaGfXh4eHh4eHh4eHh+hoaGhoaGhoaGhoR4eHh4eHh5eXl5eYSFhYWFhYWFhYWFfXl5eXl5eXl5eXl/hYWFhYWFhYWFhYJ5eXl5eXl5eXl5eYWFhYWFhYWFhYWFfHl5eXl5eXl5eXmAhYWFhYWFhYWFhYF5eXl5eXl5eXl5eYWFhYWFhYWFhYWFe3l5eXl5eXl5eXmAhYWFhYWFhYWFhYF5eXl5eXl5eXl5eoWFhYWFhYWFhYWFe3l5eXl5eXl5eXmAhYWFhYWFhYWFhYB5eXl5eXl5eXl5e4WFhYWFhYWFhYWFenl5eXl5eXl5eXmBhYWFhYWFhYWFhYB5eXl5eXl5eXl5fIWFhYWFhYWFhYWFeXl5eXl5eXl5eXmChYWFhYWFhYWFhX95enp6f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f4CAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAA';
+    var base64string = 'UklGRvQbAABXQVZFZm10IBAAAAABAAEAIlYAAESsAAACABAAZGF0YdAbAADk/qz+y/5X/pP+Pv53/j/+UP5//p7+nf6j/rf+HP/u/gP/Ff/B/v/+3/63/qz+sf6G/pn+U/6h/hL+ef5o/qz+hf6q/tf+SP/k/i7/7v4b/6f+M//S/hv/uf7Y/nX+3/5k/sz+V/6f/nT+kf6V/uv+4v48/9T+Vf/S/vT++f72/sD+zP7c/uD+k/5t/rv+Tv7G/lX+fv6W/un+/v7//jz/KP8v/z3/E/9g/+H+m//1/kr//P5O/+r+NP/R/g//4P4a/zz/ff+6//n/jP/8/0z/cf8f/xX//f4t/+z+4v6q/gj/qv5y/kv+mP7V/oX+gP7l/gX/+f7f/pH+P/7f/UD+KP5E/hH+RP4H/m7+/v1S/gT+h/4Q/j/+GP4P/tH98P27/ST++v1F/gz+Hv6v/WH+Lf63/hz+UP43/ov+oP5y/jX+TP6C/v3+xP69/l7+nv7t/uH+MP/X/pz+uP6T/ij+V/5B/i3/d/1Q+xH7z/tL+3X7+/0oBFkF2QS1CcILQwrTDmQTChOuEfwTuw4hBaL8/fey+VH9ff20/D79f/3L+eD2bvHQ587gC9t20FnG2cN5xYPFbMV0xuHIUsqUyu3N6NxK7SL0DfqRBIoP7RecHxApjTF4M4Uvqyp6KvUpuybyIjIhPR5PHAcbVxglFf8SDRAADWEIWwNw/Pz3o/Pl8V/1fvsn/Zb9XQBtBuoJkAtaD0YVZBfDFXUUaxSHFNUVmRZDFj4WMBZbFokU1BG0D5APIg/cDZwJAAfSBeEFGAMLAOr+Tf0b+y/6CvrF+hz65fmH+R766fkD/DD9zP26/E/+1gBHAsMC8wPBBRYFlANfBJcFdgWAA68CvgLdArsByQBpAOn/cf7m/X39rfvT+V/4oPcg9QHzW/QW9vv0DPR79cT3/fZ99WL1+/aI96j4Dfkm+sH6oPwe/av98/39/2oBtwFUAa4BIQJ+AnUAZf+5/4cA6v4e/cH89fy++yj7o/lh+Ef3OfcR9xf25/SK9Db0UPPT8eLxUvSI9GvzTvMY9cj13PUh9rL30Pex+Nj58Prc+l77svyJ/sv+JQDGAPMA+f8FAO//JgD0/9z/1P94/yH9Yfte+iX7rvrz+ML3HfeP9sr1K/Ua9ov2PfaJ9un2OfeZ98T3wff8+Tz83v3x/RH/EgBYAXcCiAMyBJEE8AQwBR4FLQbaBvEHegemBrEFTAXEA9sBR/7f/KP8f/yU+oL4Ifjh9vX0XfQT9Gv06/PW853z+vOp9JL1r/aZ+Bn6RPup/Mf9xv80AfsCiwQ5BW0GVQcHCOwIFAo3C44KSAmnBzMHNAfKBg8FDQT3AawBAwE0ALz+4f1K/Xz92Pwk/eL8J/0J/P37qvxM/J77YvxN/WL+xv7D/0UAqAAQAbcBWwMkBbQGVgdIBzsIDgmICXkKJAq6Ci0L1wvrCqkKtApGC2EKWQlsCb8JYghYBzsGaAbeBrkGlQSHAgMB7wCG/wf/pv5l/jP9rvzh+y/8Wvsz+/H7EP2n/tX/NgAgAZMBzgNWBV0GGwcnCBAKIwtKDKEMVA1jDZoNFA2VDAUMggsKC20KQwo8CaEHtAZfBUwEoQK6ATYA1P8//jb9DPt9+lX6xfoB+iT6cPo0++T7yfwe/fX9l/6y/0MAmQHiAvMDCAVyBpAHpQgTCcUJHwoPCxgMdwzZDCUNJg0tDWoMswvbCm8JugimB7UGgAUtBIICUQH0/1n/SP10/Df7SPoO+YH4wPiR+ez5gfpg+k37FPxi/fD9AP8PAEwBTQI1BGQFpQeuCZ8LKg33DgMQ1xABESkR3RCWEMUPkA4wDQoLHQkgB7QF8AOXAe7+fv2X+zf6yvgf9y31KPS285XzLPSp9Rn2IPeO91L50Prk/Eb+bgBPAt0E7AbFCeoL8w2ODx4RARIdE9AS9hJgEs4RDBBsDqQMQQr5B6cFGANwAGn9l/rz9/T0kvKQ8Azv4u1Z7ffsuuyl7S3vG/AX8cvxKPS59S34QfoE/fX/awNbBT0ICwrnDCMOdg9NEO0Q0BCsEMoPHA85DUwL1wieBtoDTQGD/r37cPhT9ZHyefBZ7u7rnupz6Zjox+jU6HzpOOo06/TsYe7F8DXzJPad+Hv7rP4lAtkE2wf7CRQMcw2DDhUPtw84D3IPIQ7QDKkKdAgWBq8D+QAz/nf6b/f0853wzOzq6YznlOUa5FXjTeIo4l7iKeP24/TlNOgy6p/ske/o8uX1F/k+/I7/HgIfBfIG4QgTChsLwwtdC7IKHQlYB8wFkwL5/2H8Z/lF9ejxqu3z6RnlpOFa3u/b8tmI2HbXHNfC1q3Xq9g+2gvcct4P4aHk0eeM677vrPNw9/b6Wv5pAQ4E6gVjB4oIPQnlCKgIuAdABgQExAGM/qz7n/cE9Hzv9Orf5QTinN3V2mrXINXf0pTR1NDo0G3RCtPy1NfXKtqc3bLgMOWq6VTupfIP9wf78f5AAh8FhAetCRELHAz0C8YLZAoFCYAGuwMTADz8a/jd84PvruoY5hfh89zg2HXWctMm0VXPvs51z/3QLNN41STYfdvO3m7joOfY7Dbx9PVk+uH/pQP6B/EKjw2xDyERFRJxEroRzRCYDpAMYAn3BbkBk/0R+Tz0PO/b6ebkMOB+3MrYMtaX037SEdL00tTU0Nd52mrdmOC55EnoVO0r8hj4XP3wAsoHIA3GEF4UKRegGWIbZhyCHEscxRrjGN0V+RIYD84KtQV/AEf7P/Z/8Z7smOfK43Tg/d0e3BzbfNvh3CzffuHI5EvozeuV7xf0m/h1/TMCLggGDt4T/BcgHO8fEyM5JdcmVietJw0n+iWTI6ggnRwyGYwUmg8aCv8E/f7K+X70L/D/69voueU/5NXjsORm5g3oZeoR7mzxSvXG+B39uwG9Bs8LsRB+FskcdCIjJz4r0y1LML0xxDKTMt8xxTBULqormygsJL8fSRofFcAOYgkoA9X9n/j29K3wr+2t6/nrmuy07UbvUfH48lz1Wvhk/XkCcQg7DiQUZxk/HlkjVClLLrcyQDZzOLU6STvJO+86RDlXN1g0oDBuLJsnNyJZHFEW6A9qCkME+f7N+aP19PFX8IHv8e+y75zvi/BY8wb3AvuT/48EWwk4D/4URxuXINIlmyoGMMU0qjhTO0g9oz4tPzw/Lj58PJY5KTbfMfss6ieKIi4cbhbtD+MJDwSM/s75XfZE82rxhfDA8InwzPCU8kT1Ofht/NgA9gXyCgkRlRaJHD4hYCbwKgUwozMMN/44kTo/O2Y7eDrDOBA2EzNXLzAroyU6IJIauRS+Dq0IDwOm/Rn5U/XV8Vbvze2y7Ajtee317cbv6PJ/9hz7hf92BPsIhQ6ME/UYzx3OIt0m2iqkLcowJTIZM9IyEDLwMA0v3iu+KMQkkyBuGwkWCBC0Cu8EIv+q+RP1qvD67JjpK+dm5tflQuav563p8OtQ7oTx7fTI+Or9GALsBpIL5hB9FcoZMR1OIMYhwyM6JPMk8iPXIhkhux4VG4YXmhJLDhsJawQl/zj6v/Tn7y/rjueO49zgtd5y3QPd19yv3XjfceEB5P7m1+oy7mDy6vZr+/X/PQSOCCsMcA/BEc0T1hTuFf8VvhWEFL8ScRCuDfQJvAX6AKn8zPcK89HtT+k65GbgS9xv2QbWodSr05TTYNNe1MrVrNdQ2rvdj+BX5BXodOyl8DT1qPlu/ewAmQP5BaYHwggOCTMJxwisB/kFDQR+Ae39bvqu9m3yLe5y6Zzl/OBJ3WvZ3db602/SKNCnzyjP3s+z0D3SStSz1qnZi91c4DXkY+fP62rvcfPN9sD5+PtF/sv/PQGIAW4BtABj/wn+lfsB+Qb2P/Ly7uPq3+Yv44nf59v01wXVEtL2zxTOxc37zJ7N8c0uz7PQXdM91mDZiNxY4KnjjucA6zPvMfLu9HL3E/pw+zD9V/3V/Xv9L/2e+xL6nvfU9ODxOe/h67PomOQf4aPdMdqf15/UCdIv0BrP8s60z/vPotEb03TVxNc426Xed+ID5qjpYO0D8Zbz+/Yf+bL7Lf3C/lf/LwCa/1D/vf1+/AL6wPdt9efyi+9N7L7ohuZe44fgvd3D287ZcNhB1x7XS9cP2E/ZmdoY3UDfaeLV5Wrpee388CD0Qffp+fz8+P79ADACfAOnAzAEVgOIAscAV//0/Nb6B/iS9ajyoe8W7DTppObQ5JvipuCh3hPett2l3YfdG9+Q4ADjY+UY6OnqGe5n8Rn1kvjS+0j+GwFaAzgF8wbgB6wIjAhvCMQGhQWEA4EBov52/Cn5g/Za847wI+7966fp8+eM5V3k9+O85Nbk6uU15w7qKuyD7+XxQ/Vb+En89P/zAhYGzQktDNgOVxAGEgIS/hEAEQwQ7w6vDFgKrgfqBBQBq/3t+iT4h/Ua87Hwz+6g7UPsneto7Dvtru6T8JXzDvab+YD8VQCtAyIIHQtuD4gSvBXyF60ZThtJHEocNRyvGiUZRBbmE8kQjQ2/CbcFuQEq/nz63fZ18xTxTe887tvtfO5r79rw2PKh9e746fxhAYsFdAo3DwwU5hetG+seGCLHI/4loybuJsolEyT6IUEfFBx9GHMT8w6ECXIFqwA+/NT3j/Ql8QbvPO0M7Tvt5u7T8N3zDfcf+6n/xwQhCuEPOBWUGs4fdSSIKJQrJy6xL+YvkC+QLkEsqynTJXkhWBzwFj8RXAttBXT/vfn49Fzw9O0L62fqWOrO6+LtE/Eo9D74HP0nA9EJHBF3Fy4erSSsKmovxzOjNgc5tjlnOa83lDXmMdwtuChPIhccahUEDpQGVf9K+ePzHO8U63fotuZ95u7n0elT7UHxcfbZ+5QCFwlxEd8YOCAEJ2UtrDJdN0Q6wTxfPSI99DpeOKczti5PKBki/BpsE3ML7gPL+8n0su526XHlHuPP4VHih+QK6NjsHPIl91T9BAVeDZcVvx2yJXoseDLCNg06lzu6PL878zkYN48z3S6iKcwixRt6EyYLkAKy+szyF+3H5+Tjv+DB3+nfbuLV5d7qSfA9953+cAZNDrgWfB4/JtgsrTK5Njo55ToBO6M5GTdiM7ku0CjgIbsarRKDCo4BtPmJ8v3rDObB4brett2F3RHgs+Ph6IHuevW1/KcFCQ4tF88frCjzL8o1YDrRPLU93D0XPAU5KDTCLt4nbiB/FzAOuwNo+gnxH+ht4Gjai9Zg1GHUq9VX2NvcseK+6UHyFPvfBMsOVxnKI1EtFjWFO98/aUKWQudBSj97PK03tTHdKQEhmxZUCxj/lPOf55Ld+9SizlPJUcdnxvvH1Mrwzx7X6+Bj6672BgMrDzwaIibXMGI5Lz9jQ/VFcEZRRQBDmj8jO141yS15JHcZiAww/sjw1+Ou2CPPGce+wVq/yb4EwXHEusrC0qXdaej89CkC5g9rHEMpoDMBPExBjkS1RaNF/UPsQYc+DTpnM+0rKiKEFmQIDPm26ZfbP8/PxIy8wrc4tke2Crkbv7jGVNB62/jnv/W8AwUSVB+pK2Y1Az2JQKZCXELDQbA+zjtcN5Iy9SuVI5gYWQvM+5Lspd3BzwvDcrlQshGvea6lsD21rrz0xdfR4N447RP8gwq7GCQmzTAVOMI7mT1lPX88ljopNwgzoS0zJzQefRO0BWD27+Tl1EvFtLjZrnSouKSjpHWnKK1ttL6+c8oM2VboUPikB4wW1SJKLUMz0DaTN3o30TXVM54wgSzPJugfvBZiC8X8UOzH2rLJ2Lqzrqql2Z+SnfOeDKOYqdayvL28y3baYuqf+k4KoxhPJAMs8DAHM9kzUzI4MBstfClVJGweARZtDNz++O703R7Nx7zzrq+jKJ3zmTqaAZ2Po8KrpLYawyTSMOE98TABqBA1HVsmOiyNLocvNy+aLegq9CbzIVAb2hI0CGP6xeqo2UnJOLqirUqjxJ0em0+c4Z9lpYitbbkQx8XVM+VK9H8DJRJPHZ4lSiqLLK4sUyy8KZYmfCF9G54TAwoW/ljv1N4iz8rAtrQYqrei6J6vnnWhyKbqrTW4g8QU0mbgfe9t/qgLnxgrIsQoviukLAAswSkCJswhJxtmEw0Jdvzf7APerc6pwBi0garDoy+hzqDZo9apArGTuwnIs9Wi5Pvy5gEoD2kbBSQsKpIthi66LN0ppCVpIDwZxg+TBPf2puih2Z/LYr8Qtfetfqljp++oBq04tCC9pMg+1cnid/AN/zIM+RgbIsop2C1/LzQv7SzNKJAj9hs6E3kH//r87E/fD9Jjxru8frbpspmy87TeuX/B78o91jji+u7e/AYK0BUqIHcoPS5WMfAx9TDOLRco/iA0F2IMav8d8t/k/tmBz3XGDcAPvce8R79+w6HKttOr3iDrGPlgBkMTih4PKasv3DQ7N8A2RTQHMEMp2CBvFmkKqfxs7dzettLFx8m+27kFuK25+L2RxMPNc9kb5vf04QPPEpIgsSyqNs084T9mQC8+xjrUNC0taCKPFWgFVfTf4hXTCsXLuvSyMK+4rnWxV7iqwo3OCN0B7Uv+Fw/UH+4uijocQuVG7UfvRqZEmEDKOqoyyShpG3sKpfYO46PQ0cBJtN+r3Kj6qaqud7fnwlXRyOEu9PoG4BrcLMw7xkUwTNtOw0+2TiBMf0d+Qck5xS81IjwRnvw46ELU78Nst+6veaxZrtOzu73uyq/adOyC/yMTuiUvNkdD7UsCUTNT71IzUcBN1EiLQjo6qC9JIjERZf/s7NXcoc/nxvTB/cDtw9/KnNSY4ULvz/7PDSIdWCq6Nm5AO0e9SVdKHUjsRJg/hzhlL+gkjxjxCnb+EvTA6svjfd9Y3irfC+NP6WnxlPpHBIIOoxeFH/Yl4CqVLUMuDS3AKcgkKR7QFaMN6gTa/HT1J/B07Jjruey18Ij0b/qAAdIJQRJnGysjMyk5LWUv7S4iLQMoUiHfGLIPOgW4+i3w6eai3uDZ6dfg13XaqeAu6c3yT/7kClEXoSPTLqs3ST5+QiZEDUKZPQs2LSx9HygSdwKC89/kXdgizkHH9MMaxS3JVtDk2p3nrfWUBUAVsSQFMto95UWjSqpKCklpRPA9hjWoKZgbrwvj+n7rU9wW0HnG/cFcwRnEaMp/1A3hYO5w/ecMHxwIKaE0dTyFQdBCrEFsPkU4jS+oJWgZWQwg/vbx4uZO3jrYjdVt1bfY1d1g5lnv3fk5BKkOexitIPslminMKgcq+SWsILEZixHWCNoAa/nR8u3sH+oI6ojrae7J8uP40/9NB1QOlxSeGcocjB6RHuIbvRdsEQ8L0wMN/eH1TPDa6jvoDuea6LnrTPDj9kj+mwWoDRgV4BomHwIifiKNIfsdGBnvEd0KaALr+kvzeOvg5WXjIuP75FDozu2M9Gr8BwWzDaoVphuDICYjeSOjIQkePhiREQ8JpQAv+ATxHOoj5S7i1OGX443nGeyy8rD6RwM9CzcTHhnhHfofYSCXHlUbchUjDxMIpQBW+fnyDO0v6TXnQufE6PDr/vC99kD9PwT8CngQ4xOVFlMXRhawEzgPSAoqBOD9HPhf8yPvF+yc6hHrZewP8Pn0GPv2ANoHNA3wEm8VjhdjFxcWyxL8DTgIGwK1++z1OvBJ7ALpj+fc5oDoO+xb8RH3vP3RA+kJNw7/EZQUQhViFFgS4Q7PCoAF6QBX+2X2bvLG72vusu3S7v7w0fME90n79v5kA50GTAnGCjEM1QuiCsYI5waeA/cA1v3s+y35GfiU9wr4nPj4+f36Af2P/o8A8AH7AqUDBQT7A6sDiAKYAWEAWv9Q/r/9Wf0f/Vn9zf38/TL+Z/+c/z8AZgBpAJ3/m//S/0L/lP6X/s39Kv6//WX++P5nAOEAIgK/Ar8DrgPHA0QDmAK/AWoA9/5f/Xj7Ovpx+IH3yvZA9//3Lfmi+n38af5FAeMDOQY5CB0JMgp9CoUKPQl2B3MFFQNJALv9qvu5+fb3L/eS9ob3D/hs+WH6lfzq/X0AyQFwA44EugVyBsQGZwZbBmcFGQVjA5UCWQHnAKwAdQAGAEIAGQC5APEArQFDAncCNQL+AYMBRQGsAL3/F/5D/a38FPwV/J38TP24/f7+iAB3AjgDLgTyBA4GkQYnB9sGYQYKBfUDrwGNADr+Gf1d+4v6uPlf+Qz59vl5+tj7Df1+/hsA6wEZA4oE7wS4BXoFQAUlBP4CvQEeAPL9Ivzw+b74gPdV9jX2rPVS9gb3yvic+qD8/f6oAGMCTQQSBbIFdAVsBV4EYAMBAXz/Hf04+3P4Y/cr9aDzvPIy88fzSfQ69YT3cfny+wv+AQGWAp8EBgaaBrsGngbEBdUDOgLW/3j9xPpT+LD2pvQB87HxN/Fd8RXya/NI9UX3Nvk6/HP+YAFTA0UF8gWjBkUGTgZvBWYERwInAK79RPu2+Nf2fvT88pbxFPEC8RXydfJI9Kb13feA+Sn7Hf3F/gYAxgAmAcABMwHfAOn/Lv9V/hH9ePzH+9b6MPpf+Z34WPjg99b3APf99hr3X/eG92n3VPe29zP3svdl9/X3A/gM+X75v/oY+2T88PwI/uf+jP+1/5L/Y/9Z/23+7f1e/DL7/PiQ9xn2S/WA9HLzivKU8hbz9/Nj9VD2Kfih+RL8yf1B/3gAcwFuARYB0gC1AJj/pP5I/bf7+vmw+LX2mPVt9MH0f/QI9VT1WPZ/9yP5BPqC+7P8+P2r/nj/HQC2AGQABgAG/5r+Vf3Q/L/7+/om+nL5Ivne+Gj4DfgL+IL4Afl1+Qf6x/qW+wz8lPzu/I79R/7//or+8f4p/sz9Q/2j/BD8B/x5+/H6Mvps+qf5k/ka+cj5pPn/+Rz6DPtt+1r88PyZ/b79Sv7Q/iX/h/6v/gz+A/5f/dP8ZvwZ/In7+Pqj+p/6jvqK+r36y/p3+4v7L/y3/PH81P1j/s3+DP8g/6L/VP+n/wr/sv9X/xn/SP5P/uv9Nf6t/fH9rP2v/QP+Ff4d/oz+Rf6l/lX+pf6k/qn+Av92/3P/yP/Y/wUACADT/5EAsADZAB4BBgFXAYwBsQHXAS8BAQGYAEgA2v+8/2n/zf9I/4H/w/48/zv/9f8gAHoAGAG7AcIBdQLZAscCmwIBA3sC2QK3AvgCZwJAAqQBfwH8ALUAUAAGABQAfAAiAJMAlgCNAMEAJwFRAa4BcQKxAuwClQKUAosCmAJ8ApcCEAIRAscBrwGSAYcBRQEuAaQA6ABcAOwAxQBYAeUAcQEYAVUBZgELArwBLAJmAugC5wIMA/ICIAO3At0CVQJcAhYC8wHKAacBhQFwAYMBegGOARQBZwGcATwCWgKtAn8C6wIBAyUDKwP9AvsC/AKiArwCNQJtAtEB0QERASMBqgC1AKsAvQCoAMwAuQCuAKEA/gDLAFwBDQFuAVQB/wGPAYUBgwFxARoBKwEXAfwA2wDPAHsAsgBcAP//+v+z/4T/S/9L//r+8P5D/7z/yf+IAPr/dABVAFIAXACcALYA5gDkABIBpgCoAOr/0v9f/2//0f7w/j3+ev4a/hD+7v02/kz+';
+    chat_notify_audio = new Audio("data:audio/wav;base64," + base64string);
+
 }
 
 // Issue a pop-up notification using the web standard Notification API
 // https://developer.mozilla.org/docs/Web/API/notification
 var chat_issue_notification = function (theBody,theTitle) {
-    if ( !chat_notify_granted ) {
+    if ( !chat_notify_granted || !chat_notify_enabled) {
         return;
     }
     var nIcon = "/images/icons/48/group.png";
@@ -244,8 +256,38 @@ var chat_issue_notification = function (theBody,theTitle) {
     n.onclick = function (event) {
         setTimeout(n.close.bind(n), 300); 
     } 
-    // TODO: Allow audio notification option
-    //chat_notify_audio.play();
+    if(chat_notify_audio_enabled) {
+      chat_notify_audio.play();
+    }
+}
+
+
+function toggleChatNotificationAudio() {
+	if(!chat_notify_audio_enabled) {
+		chat_notify_audio_enabled = true;
+        $('#toggle-notifications-audio-icon').removeClass('fa-volume-off');
+        $('#toggle-notifications-audio-icon').addClass('fa-volume-up');
+	}
+	else {
+		chat_notify_audio_enabled = false;
+        $('#toggle-notifications-audio-icon').removeClass('fa-volume-up');
+        $('#toggle-notifications-audio-icon').addClass('fa-volume-off');
+	}
+}
+
+function toggleChatNotifications() {
+	if(!chat_notify_enabled) {
+		chat_notify_enabled = true;
+        $('#toggle-notifications-icon').addClass('fa-bell');
+        $('#toggle-notifications-icon').removeClass('fa-bell-slash-o');
+        $('#toggle-notifications-audio').removeClass('disabled');
+	}
+	else {
+		chat_notify_enabled = false;
+        $('#toggle-notifications-icon').addClass('fa-bell-slash-o');
+        $('#toggle-notifications-icon').removeClass('fa-bell');
+        $('#toggle-notifications-audio').addClass('disabled');
+	}
 }
 
 function chatJotGetLink() {